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

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

Change-Id: I10845b74adbba4c5a23df8b48d6eaf8e7ddd9c98