Merge changes from topic "presubmit-am-6b866f7892154cf29a29f35117f0f9fb" into sc-dev-plus-aosp am: 63d14d4b0c am: aaa4e675dd

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

Change-Id: I00ff7e47799ce3c99b87d5f1b2152762b8734547