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

[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: f785ca2d am: 753e76ea -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: I33b7fa496649e0a22c8f15fc3714f3c4c03072db