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

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

Change-Id: I6d5b12840e9940ecb5d076591ca8514b0085f438