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

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

Change-Id: If72b9aaa17e249791d98eb666daa8a51040ba6e5