[automerger skipped] RESTRICT AUTOMERGE am: e8551a88 am: 6b6c1353 am:...

[automerger skipped] RESTRICT AUTOMERGE am: e8551a88 am: 6b6c1353 am: 2c54e625 -s ours am: bcea247e -s ours am: 11c4f67e

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

Change-Id: I7ac85c1a6a9dffbbfd0063d0c86a5bd826f15a5b