RESTRICT AUTOMERGE am: e8551a88f6 am: 6b6c135380

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

Change-Id: I2d4bc8b16fe0a709a8a4560a4e685e98c89e570d