[automerger skipped] Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev am:...

[automerger skipped] Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev am: 1b804d13 am: 1ce21745 am: f69e01a4" into rvc-qpr-dev-plus-aosp am: 6e93a6e9 -s ours

am skip reason: Change-Id I54c668427c06c415584cc80d6e7d35d451b28393 with SHA-1 1521c58c is in history

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

Change-Id: I2d9f32b0b6c54bbd24d6402699b86d9e60ae9afc