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

[automerger skipped] Merge "Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev" into rvc-dev am: e303dd65 am: cd85e100 am: 03287bce" into rvc-qpr-dev-plus-aosp am: 94fb6b71 -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: Ic56a7db4984cd64adc49979ede2b822f3587dd08