Merge "Remove most of FDE support" am: a70c666688 am: 650828aabf am: d7a58896a2

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

Change-Id: Id5d3cb85951ae5b2bceca4e586897303d9c2344f