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

am skip reason: Merged-In I0876bc9fbf0c1ee4aa4d6321aab8f5a05124415e with SHA-1 366eb82f62 is already in history

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

Change-Id: I7e01bdde184e57d945ffc40691f0da06cd1097f9
tree: b119493fdce56cac570f7cee8fd2a63348728a8d
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS