[automerger skipped] RESTRICT AUTOMERGE am: e8551a88f6 am: 6b6c135380 am: 2c54e6259a -s ours am: bcea247e03 -s ours am: 11c4f67eea am: 518a3cfaab -s ours am: a7bc88f935

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

Change-Id: Ibaf6e94734961332a26babd49267d1bdc14d65a8