Merge stage-aosp-rvc-ts-dev into rvc-dev am: 1b804d13 am: 1ce21745 am:...

Merge stage-aosp-rvc-ts-dev into rvc-dev am: 1b804d13 am: 1ce21745 am: ada73750 am: d0b45eee

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12203423

Change-Id: Id4a1af6e608b4495325660a7d836967724072e7f