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

[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c am: a9c08f43 am: b2e6bdfc -s ours am: 1411e29a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic354490bcf702efa927348513ac90df93b4d74c9