Merge "[automerger skipped] Merge changes from topic...

Merge "[automerger skipped] Merge changes from topic "am-6f770425941c4b038ea830d1a049926f" into rvc-d1-dev-plus-aosp am: b4d48ef8 -s ours" into rvc-qpr-dev-plus-aosp am: da80b8b4 -s ours

am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc is in history

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

Change-Id: I1d8656a3e2384df0b986c0b9f93028022e537670