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

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