[automerger skipped] Merge changes from topic "remove-fde" into...

[automerger skipped] Merge changes from topic "remove-fde" into sc-v2-dev-plus-aosp am: a00c3277 -s ours am: e92bac31 -s ours

am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 b4060ef6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17110591

Change-Id: I016484f655421273710796b664d86657c412cf02