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

* commit '6329bbceebc8c0d6de164cb693a828402542fd35':
  The voice assist may now be launched above the lockscreen