[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: a252477bfa -s ours am: f7adf97979 -s ours

am skip reason: Change-Id I80d25d3862efb1b3a0f513e1d4ea70c487af2c29 with SHA-1 033cb74778 is in history

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

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