Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482 am: 7bd81fc2ed am: 21e70f4e18

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

Change-Id: I38c8800887897982be9262af3d22f7b4e97215c0