RESTRICT AUTOMERGE am: 30b022a8d2 am: 392a927cef am: bbe7a90031

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

Change-Id: I156306e220866b2880a47cea2879599e29e2e2e4