[automerger skipped] Merge "Merge Android R" am: 92767c5101 -s ours

am skip reason: Change-Id I6915eba4e24ab91402540f89abbfc871b96e5d16 with SHA-1 e0de71ef07 is in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1422289

Change-Id: Iac619d5b31bbd5046af37a0c0bf036e336ef3bdf