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

[automerger skipped] Merge stage-aosp-rvc-ts-dev into rvc-dev am: 1b804d13 am: ef938ec6 am: f71c9a58 -s ours am: 83eb00b0 -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: I7f95d1c0201711396caf9c19521f04928c9cacd8