RESTRICT AUTOMERGE am: e05538421f

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

Change-Id: I614c15f08f8224f1cdf41719485db9b74639e9f9