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

[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: b5393886 -s ours am: 13a80d91 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8a90755125cf23c8cb9c2b92284f7f008049214a