am 3678a5fb: Merge "Move crypt commands to a different listener in vold" into mnc-dev

* commit '3678a5fb8d1094c4796c1316f3b571cb63cf7246':
  Move crypt commands to a different listener in vold