Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev" into rvc-dev am: e303dd65 am: cd85e100

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

Change-Id: Iedd074b1320c4b0856822f5b8a5d3711625d0d34