Merge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev am: 31b96311bf
am: ca504aae64

Change-Id: I434d05ea7354eb9de535ef5279d7a1c5302fed1b