[automerger skipped] Merge 24Q3 to AOSP main am: 89cf672a57 -s ours am: 3bd3394a96 -s ours

am skip reason: Merged-In Ifaa7f5438f1ad9a745a72a416bd80ea2f3fecae8 with SHA-1 453799cb85 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/3258481

Change-Id: I295d091f9b1a494ff3dd9059489f8511ed12978c
Signed-off-by: Automerger Merge Worker <[email protected]>