[automerger skipped] Merge Android 14 QPR1 am: ae28f5b0e5 -s ours am: 0120788127 -s ours am: c17cee08d5 -s ours

am skip reason: Merged-In Id5c5f0bdd69491739a4dccff677265369870a1d7 with SHA-1 8550530592 is already in history

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

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