[automerger skipped] Merge "Merge Android 12" am: 65c8bd6f10 -s ours

am skip reason: Merged-In Iccbc0d804f2115e83f8eb2889a57b66b77e0cd27 with SHA-1 4a8b399f0a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1847855

Change-Id: I84791c1e06acacf53178eb40899b5f8f025f4b5b