Merge "Don\'t lock device when double tapping" into nyc-dev
am: 347bb9a

* commit '347bb9a3cf53595b8beed17574cec9c0072aa819':
  Don't lock device when double tapping

Change-Id: I964ae558db13679b5d15220a7c783b75ea894b6b