[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT...

[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 02ffec11 am: 463ba991 -s ours am: 0ece74a2 -s ours

am skip reason: Change-Id I2ac90f493820187f3b694a4113faeb5dbcaa9299 with SHA-1 5fcea7ab is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1487678

Change-Id: Iedaabcae714e2c91407432aff3dd6b21b11a0c52