[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

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

Change-Id: If7eba4ead3e538f7c9caf47c73802f3ceb2ca041