Merge "Revert "Only run vold command when file encryption enabled""