Merge changes from topic "presubmit-am-ed1f83fcc3e44647b02fa34af6ecfa42" into sc-qpr1-dev am: 58ca03d6ba am: 0b28072034

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

Change-Id: I2fd5b2fdcef0c42077c54cadb1a1ea8bd08e9ae4