[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 0c81418c41 -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: I1b2ebd17c9c985daeb4a53dbfc00a785de00ec54
tree: 2633e741f7980841567a7e05b925b70cb5bfa4c6
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS