[automerger skipped] Merge Android 12L am: 08fc93e240 -s ours am: ed8f44c0e1 -s ours am: dd39a2df30 -s ours

am skip reason: Merged-In Ib93078ad055ca21825e1d07b0e42b2ca20ceedb9 with SHA-1 aefaadf8a7 is already in history

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

Change-Id: Ie76d1624a5741998a8991c013ca1158b61f23787
tree: 7bf16fd35d0dc7a8580c521bc34a6111a682d965
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS
  7. PREUPLOAD.cfg