[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: d20bc61434 -s ours

am skip reason: Change-Id Ibb9c7ea3c8a9c4ea839b40c568269ff3c5dbfaa9 with SHA-1 7e0821fe2a is in history

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

Change-Id: I37b267dd4786571235e85470603269f93478ca93