Merge changes from topic "presubmit-am-4b965ed61571430195cd51257a9aa8e6" into sc-dev-plus-aosp am: a208b04e06 am: e6c338ce21

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

Change-Id: I18d87c171523bba87d5a52945a94924c3912b9e2