[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: f07c154c39 -s ours am: f0a20b45c1 -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: Ib76cad598a00007747b500dc57eb4a54d3329567
tree: 2633e741f7980841567a7e05b925b70cb5bfa4c6
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS