[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 6cfc2d24ff -s ours am: df251ab928 -s ours

am skip reason: Merged-In Ie9ec0166f99388cc4f7eb362c1df9f0328ff2be0 with SHA-1 7e1d82fab3 is already in history

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

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