am e948bfeb: am 6329bbce: Merge "The voice assist may now be launched above...
am e948bfeb: am 6329bbce: Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
* commit 'e948bfeb':
The voice assist may now be launched above the lockscreen