[automerger skipped] Merge Android R am: 6e56ff26c7 -s ours am: 313859089a -s ours

am skip reason: Change-Id Ia2a3906818c66adc28c14047af395289306da9aa with SHA-1 6e9b1146e4 is in history

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

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