Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06

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

Change-Id: I3b54fb6905a9286037db54654e372af6929d9f41