[automerger skipped] Merge changes from topic "remove-fde" into tm-dev am:...

[automerger skipped] Merge changes from topic "remove-fde" into tm-dev am: e945bd62 am: 95e3ba7a -s ours

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

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

Change-Id: If8b5775b298863e8425d260b13f455b69a9a885f