Merge changes Idc218e5f,I26c3fafc

* changes:
  Remove more FDE methods from StorageManager
  Drop FDE status checks from DevicePolicyManagerService