[automerger skipped] Merge "Merge Android R" am: 92767c5101 -s ours am: 83266c89bb -s ours am: 78f78aa77a -s ours am: 396f7c103c -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: Idd48ea574d0d73ccc9c96cc9bf95f9f7c0244d08