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

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

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

Change-Id: If5b406e6d8b2842eadaf08856871fe8402ba9feb