Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am:...

Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: b5393886 -s ours am: 13a80d91 -s ours am: efdca76d am: e945d13e -s ours am: 210a283e am: 5d20b096" into rvc-d1-dev-plus-aosp am: 5e9c8c57

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

Change-Id: I9f9755fb5465f11557a186c07fcc2f8bdeb56b5f