[automerger skipped] Merge "Remove ZigZagClassifer from lock-icon longpress...

[automerger skipped] Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-dev am: 7326de8c am: 5df2f27c -s ours am: 7fbbadb1 -s ours am: 3e9ce862 -s ours

am skip reason: Merged-In Ic9fa82a549599e48d281b4db69c04627803c6c5a with SHA-1 374f321f is already in history

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

Change-Id: I9f7aa0a4735de865217fac8ee4c25f8b40c79dff