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

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

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

Change-Id: Id3cf8034c08d231c4dcb91a836150f94c17c9e02