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

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

Change-Id: I184b46b4b02f370e51fa3b1f8043731a9888ba11