Merge "[automerger skipped] Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-dev am: 7326de8cc3 -s ours am: 14755715de -s ours" into sc-qpr1-dev-plus-aosp