[automerger skipped] Merge Android 12 am: e50d84f657 -s ours

am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 a048cbce4b is already in history

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

Change-Id: If416e389ded2483b6cd379cb988d2f841b0b92df