[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 0c81418c41 -s ours am: 28018461fb -s ours am: 8c617deb0b -s ours am: 060919cdf9 -s ours

am skip reason: Merged-In Ib76cad598a00007747b500dc57eb4a54d3329567 with SHA-1 266060f0d2 is already in history

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

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