[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c18fffca31 -s ours

am skip reason: Merged-In Icc1c437bcb529defe59ce82df732e596ea14118e with SHA-1 954a1d2d32 is already in history

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

Change-Id: Ifaed9f9e24af564c024f2ffb0a26412055be2a19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>