[automerger skipped] Merge Android 12 am: 4ef536a83d -s ours am: 686081c07b -s ours am: bf331e2bdf -s ours am: 85374bd515 -s ours am: 61ea34ec37 -s ours

am skip reason: Merged-In Iccd4a4a125e5764bbf81051d82263edef1477c4d with SHA-1 38c57d1df8 is already in history

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

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