Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev
am: 882a080

* commit '882a0802a7f7268750b15adb8747dd3904f935b0':
  User action should only stop lock task mode if it is in pinned mode

Change-Id: Id2a1e5cfc512c352aaeb93f570a8f6c288a4ee3b