[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 5d6390ca73 -s ours

am skip reason: Merged-In Ic24223bc90e24f24f54bd865057ce0de563874e2 with SHA-1 8c5cccd4e8 is already in history

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

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