Merge "Merge "User action should only stop lock task mode if it is in pinned...
Merge "Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev am: 882a0802 am: 2e1f4eb9" into nyc-mr1-dev-plus-aosp
am: 0c5a5388
* commit '0c5a5388':
Change-Id: I5dcbe69f4a77ff27359848bc7cb9413add057794