[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: b84c0e0f am: 3c84d4ac -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia6b392ae409782e2223bd0c54134413dfe532006