[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

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

Change-Id: I0f26311f49dc12ac62d0fe7cad161c617fb04940