Merge changes from topic "presubmit-am-4b965ed61571430195cd51257a9aa8e6" into sc-mainline-prod am: 9b0e0d51a5

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

Change-Id: I74a58af46a61e8300887685936e421708f43734d