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

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

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