[automerger skipped] Merge "Merge Android R" am: 84f0d5475c -s ours am: 917454105c -s ours am: 703f7193db -s ours

am skip reason: Change-Id Icd947062758ba7404d1329feb24ec581837f596e with SHA-1 b0ef392780 is in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1422515

Change-Id: I79522a9de778579ebd40c07bd3be9852169ffb9c