Merge "User action should only stop lock task mode if it is in pinned mode"...
Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev am: 882a0802
am: 85c2982c
* commit '85c2982c':
User action should only stop lock task mode if it is in pinned mode
Change-Id: I25eef7659032563d5cdf117fdbebf13113918f96