Merge "Remove support for converting from FDE to FBE" am: 804dc16a03 am: 629db5f9f8 am: c749aa3ed1

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: I919c43559218b13c0f6188e04f104f3051a28731