Merge changes from topic "remove-fde" am: 841350e6ac

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

Change-Id: I660b00cf0be43d004004b9dcf449ce43191a6034