[automerger skipped] Merge Android 12 am: 7368a62409 -s ours am: fa40b9fb1a -s ours am: e6dd1eed52 -s ours

am skip reason: Merged-In If42a44ede17005e5e150bf17bfcd5a4bd3f278ec with SHA-1 0c81418c41 is already in history

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

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