Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev" into rvc-dev am: e303dd658d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203661

Change-Id: I175dd261b683c99056858db52163718d5b4b7e4e