Merge stage-aosp-rvc-ts-dev into rvc-dev am: cc2381c482

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

Change-Id: I956e8dacd7b52ad521f76df7798794724b7cff6d