[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: bdc59e6355 -s ours am: 149759065e -s ours

am skip reason: Merged-In I3d2d80ed53c5726a35a7d1ca43cafe9c45c127f4 with SHA-1 5aa4b33fe8 is already in history

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

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