[automerger skipped] Merge 24Q4 into AOSP main am: 8599affe18 -s ours

am skip reason: Merged-In Ief80a6364a1651f2ed17e1e71cfa6f5e53fc12b0 with SHA-1 0066e0da3d is already in history

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

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