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

am skip reason: subject contains skip directive

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

Change-Id: I3d5317bf0c37e855829aa8bf4e4ce6ec327e76b9