Merge "Merge "Fix crash when launching assist from power button." into qt-dev...
Merge "Merge "Fix crash when launching assist from power button." into qt-dev am: c74d6b56" into qt-dev-plus-aosp
am: 8abefa76
Change-Id: I18227e67c784310df21a493a642b4c714b06d187