[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: efdca76d am: e945d13e -s ours am: 210a283e am: 5d20b096 am: da0033c0 am: 217e55a3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I77fcf84f7d745c17bb619305805d52e1719be4d5