[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

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

Change-Id: I178c86aec2adcbd59cc07693fd1878d9066c928d