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

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

Change-Id: Ife0a24bbeac6305c03f599230dc77d604e8ee8b7