[automerger skipped] RESTRICT AUTOMERGE am: feb4dd913c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I75af8cb60a406b4f8150ef74512c5fdda1436b02