am 6e8c8f54: Merge "Revert "Only run vold command when file encryption enabled""

* commit '6e8c8f542d673f3402df6b70df64b29c759e526a':
  Revert "Only run vold command when file encryption enabled"