RESTRICT AUTOMERGE am: 30b022a8d2 am: 392a927cef

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

Change-Id: Ide22b7aad882e5f2613b636d6ac8809e302dba99