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

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