[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 am: 518a3cfa -s ours am: a7bc88f9 am: 5ca3e9d6

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

Change-Id: I93a06cadf454318e88594441cca8388803352748