Merge "vdc: remove FDE commands" am: c1b4ce01f8 am: 1d1c8a541c

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021636

Change-Id: I85e1a9a082b2ea711841dff903dcc97bb19edbed