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

[automerger skipped] Merge "Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev am: 5179b1de am: 34bf6a82" into sc-v2-dev am: fcd72a8d -s ours am: f12c70b8 -s ours

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

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

Change-Id: Ib3b0a2a3ef43ffe82ea25e14fcc9cca036c01d4b