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

Merge "[automerger skipped] Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-dev am: 7326de8c -s ours am: 14755715 -s ours" into sc-qpr1-dev-plus-aosp am: 6a41a8da -s ours am: 6901e8b1 -s ours

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

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

Change-Id: I198f685f97fc084bfcf47d36978aa634813f841d