[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6cac9e854d -s ours am: cf81650c4e -s ours am: 3d46b10519 -s ours am: 4e2780b465 -s ours

am skip reason: Change-Id I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6 with SHA-1 56462add52 is in history

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

Change-Id: Ia7947d9e1adbfb86df5ab7f8a1309e6375129e61