[automerger skipped] Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into...

[automerger skipped] Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-v2-dev-plus-aosp am: a55da3f0 -s ours

am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 ef804614 is already in history

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

Change-Id: Ib543e118fa0e78fe745b35b6e7dfb4f62a17cfab