RESTRICT AUTOMERGE am: e8551a88f6

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

Change-Id: Ia5e5c97d0b564f8af1c870b8fdf5045e55b87076