Merge stage-aosp-rvc-ts-dev into rvc-dev am: 1b804d13e3 am: ef938ec67d

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

Change-Id: I0b0a7ee68f592aacb4b6241f76e880ab475f0be1