[automerger skipped] Merge Android U (ab/10368041) am: bdee41ae66 -s ours am: e0aa91ab13 -s ours

am skip reason: Merged-In I5bc45581ee16e77240bd719f6bf53a650b010334 with SHA-1 2f02f2e83c is already in history

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

Change-Id: Idd4c0e906dd1eba117c85225bfaa0018c9a17b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 49e12878ff22c23d42ddc65cb217fc450cd6e6d5
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg