[automerger skipped] Merge Android R am: a3d3f9df79 -s ours am: 4357b5a094 -s ours

am skip reason: Change-Id If047a34e34220942c2bb174f7692b3a5a6cd50f7 with SHA-1 a1d075081f is in history

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

Change-Id: Ie3cb9ba10e970c75c4ec82658ea4705c600f29f4
tree: 4f20b5e8e58c3c08989e32d02060f54b2084a062
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml