[automerger skipped] Merge "Merge Android R" am: 368fa68f5c -s ours

am skip reason: Change-Id Ic0ab86ded3598e18745fa9f82b3ece88d629de91 with SHA-1 a6d0b84554 is in history

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1422554

Change-Id: Iab402917470d6940bc3c745985677cf35bf612b4