[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: b539388631 -s ours am: 13a80d911d -s ours am: efdca76dc2

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

Change-Id: I4a73acad6efa6fb77d07fb9d81f2199fec8e8b7d