[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06 am: a9c08f4361 am: b2e6bdfcdb -s ours am: 1411e29a3e -s ours am: b91616178e

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

Change-Id: I95878fd9015adafe1225a214bde6c3148b97f5c3