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: I23fee74872e7581df95b9b12260a02a13d3d90fa