[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: e3b1744330 -s ours am: 8f3b76a545 -s ours am: f2fc71819f -s ours am: 06095f588c -s ours

am skip reason: Change-Id I351000b81430c58bde24de7de6e401a18ef29f56 with SHA-1 671129d47a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/12470166

Change-Id: Ia745765d22b3fb3ee1926c4b76d72a5e05345cf8