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

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

Change-Id: Ia49458be2ffcedafd1bda9d1f5c5d1512a11943f