[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 9a0608ac21 -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: I2aea1ab3da767a66dc5f4637cde73030cb65d218
tree: 55848eaf841b78e5e2d9aa891a9a06317f8ae75a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg