[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 21a2fde806 -s ours am: 447eebd487 -s ours

am skip reason: Merged-In Ib05eb81493d0f562f8c6684560f428fd61f68e45 with SHA-1 3c8ac109ea is already in history

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

Change-Id: I17d85d5edfe78451c8f0f39a097cecafa98e08a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 892b34dc4b0830c5cfc7e3e4cfe65865bcbb0494
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS