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

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

Change-Id: Ic24f8944c1a55af4be69ce86fd9e65818f83ef2f