[automerger skipped] Merge "Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev am: 5179b1de82 am: 34bf6a82d6" into sc-v2-dev am: fcd72a8d05 -s ours
am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 d732692ba7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16524353
Change-Id: Iad90195d9286458f84b2910139076294db8a85b8
This commit is contained in: