Merge changes from topic "presubmit-am-b6d95a89522d431884507f8083029592" into sc-qpr1-dev am: ac133d0360

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

Change-Id: I0c2647544ef0d72af6f2184a63f389102b881a0b