[automerger skipped] RESTRICT AUTOMERGE am: 78fe3b0aa2 am: c2a8913cf0 am: 12b250968b -s ours am: a5f045da44 -s ours am: f6d5e9eafc

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

Change-Id: I19bef4bbbe43ff6071d1abca496f8c44499a3366