[automerger skipped] Merge changes from topic "remove-fde" am: 841350e6 am:...

[automerger skipped] Merge changes from topic "remove-fde" am: 841350e6 am: 741d018f am: e404aac6 -s ours am: 44246661 -s ours

am skip reason: Merged-In Ic24a5b029bdf51dec622d1b70cef9ef26c3d54c5 with SHA-1 ad08fcc7 is already in history

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

Change-Id: I398753d8abede3e9359e6fa2323b9b13a6cf3175