Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
am: 3fbd93056e

Change-Id: I8bc8e01a97711fdd30ff59aeb72d38e8acaa7c75