[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 4116ceb8c4 am: 0e3db3b687 -s ours am: 61a7afd407 -s ours

am skip reason: Change-Id Iff1e6753c22c9a6f5761a65584d74c29334b99ab with SHA-1 10aff55529 is in history

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

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