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

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

Change-Id: I7949c7f4b4d62f8a38563b2705995cefa69cedaa