[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: 75c8fd9e

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

Change-Id: I6c831f436c1b2e6ef20d465980cfb5aa13675c1a