Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp am: 8759977034

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399

Change-Id: I15971a15b015f3f30a7c9829329008ba34aaffd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>