Merge "Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev am: 7c95e968" into oc-dev-plus-aosp