[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: f07c154c39 -s ours am: f0a20b45c1 -s ours am: 266060f0d2 -s ours am: 1f2778cbb9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6f6d0af67877684fe56255661bdf404fbcb6b2cf
tree: 2633e741f7980841567a7e05b925b70cb5bfa4c6
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS