[automerger skipped] Add ALLOW_SLIPPERY_TOUCHES permission am: cccf1915 am:...

[automerger skipped] Add ALLOW_SLIPPERY_TOUCHES permission am: cccf1915 am: bc364200 -s ours am: 450139ff -s ours am: fcedbedb -s ours am: 8b8c2ceb -s ours am: 96f5db62 -s ours

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

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

Change-Id: I1fa7d92fa76be320d66c08ab286c2f9ab004577a