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

am skip reason: subject contains skip directive

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

Change-Id: Ib07731f1f57714962d312f458dc4c966edcdc970