[automerger skipped] RESTRICT AUTOMERGE am: feb4dd91 -s ours am: ef72a9b8 am: 7a85d4de -s ours

am skip reason: subject contains skip directive

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

Change-Id: I895f820f746e4f2071f02ad04a444b8deb5b5ec9