[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: bc19b9f8c7 -s ours

am skip reason: Merged-In I125bac46e535a5866d5d01f305fd06c9b29967c3 with SHA-1 191c8f1e44 is already in history

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

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