[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: c115fd26db -s ours am: 602d0ff125 -s ours am: 474aa4a25a -s ours

am skip reason: Merged-In I88374088e5bd8ee325d4585f9547b45a0e10eb80 with SHA-1 7a25abf73a is already in history

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

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