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

Change-Id: Iabff9ca955aef414ad7e62e0c68e2774ff01c9b7