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

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

Change-Id: I522763f8fbbf4fe4f47eefd67a25f9c67b88d071