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

[automerger skipped] Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev" into rvc-dev am: e303dd65 am: 0a032766 am: 4c67764a -s ours am: 6e7da04e -s ours

am skip reason: Change-Id I5f50166322b662b457e1b79b2ce62c622ddd1013 with SHA-1 6c01bf5f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203661

Change-Id: Ie41b07aeace1902ae7f167c29e1c19d87d8b935f