[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 0441a5bd32 -s ours

am skip reason: Change-Id I252b60e23db8e01fd2646b472834f415ac5da336 with SHA-1 4cb5af9389 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/LocalMediaPlayer/+/12470282

Change-Id: I544ad284cbaf7d6a2e9df5f162ac80808271210e
tree: 14c52d280ad337a3554e6fa0de4ae6327c59dd11
  1. proto/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS