[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: aefaadf8a7 -s ours am: cff2c70070 -s ours

am skip reason: Merged-In I766c672ea88b35e6e91beeec393fab5efbd9366a with SHA-1 0ed481ceea is already in history

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

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