Merge changes from topic "tc_change_23042206_48" into udc-dev am: 157fe80b33

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

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