[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 6dc2a00b46 -s ours

am skip reason: Change-Id Ib6ee2549cbe7a043dc961f50cfab666bf0174ae5 with SHA-1 c97af9685f is in history

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

Change-Id: Iff1e6753c22c9a6f5761a65584d74c29334b99ab
tree: 6836c2184b90203c441649678daa7b94757d4bd9
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg