RESTRICT AUTOMERGE am: 78fe3b0aa2 am: c2a8913cf0

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

Change-Id: I603a9a03417c985a7d766e3acdc546ad5db0c4c3