[automerger skipped] Merge Android 12 am: 092176baf6 -s ours am: e7de0d85e6 -s ours am: aa87f4daab -s ours

am skip reason: Merged-In I9005a2833ba6df815b108ff213286afca56df475 with SHA-1 6d9dbe2823 is already in history

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

Change-Id: Ia5d741de406b2e282a717fe36083265fea61c032