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

am skip reason: Merged-In I630bdfee09afa81be4490b961d66dde18de0b6b7 with SHA-1 9ac71a47fe is already in history

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

Change-Id: Ie4396f19db43c91552efa6f4cd0c374ac95e5e4f
tree: 79dc4d7efbc1a5f8d9ddc3382a57cc584385c374
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml