[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 8c5cccd4e8 -s ours am: 1dcc249d4d -s ours

am skip reason: subject contains skip directive

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

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