Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
am: dcb6efcd55

Change-Id: I5e4b04c054522f7620a0a8e1b37830cf2e3711da