Merge "Do not launch assistant via long press when device is locked." into cw-f-dev
am: 2ab563ec6a

Change-Id: I704706ad32b64c4b28ded7b6423300b78ae7762e