[automerger skipped] Merge Android 12 am: 8e67f244bc -s ours am: d319dcbaa2 -s ours

am skip reason: Merged-In Ifc42e945b0c18ccd8af8461314dbd75a2c535445 with SHA-1 e4acf5e340 is already in history

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

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