am a71ef0d5: Merge "Only run vold command when file encryption enabled"

* commit 'a71ef0d5b5c0e304d947f3782603890294d06ee2':
  Only run vold command when file encryption enabled