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

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

Change-Id: I60579a7a49f3b2c3288c814cb6e4c70463854dbd