Merge "Remove support for converting from FDE to FBE" am: 855ec2d31a am: 6a72370d4b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027583

Change-Id: I07ed4132c24152febfa4c2ae323594452953f043