[automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb

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

Change-Id: Ifbb1b1d6c87c1c115ba6556dea99da05f5965dff