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

Change-Id: Ie42d8d1e7215efbfbb5cdb2569cd5362329b8e2f