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

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

Change-Id: Ifd2c099d2d42a22bd3fdbbeb50f82fdb213d5d2f