Merge "Remove support for converting from FDE to FBE" am: 37a4f4d243 am: a062eda2e8

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2026966

Change-Id: I8511caaee264218ca6fa1aaa310488b0446fa43d