[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 9a0608ac21 -s ours am: ae148508d7 -s ours

am skip reason: Merged-In I8aa1e69db4609d72463a59c359af2ff7622dfa8a with SHA-1 5d6390ca73 is already in history

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

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