[automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209 am:...

[automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209 am: fa38c498 -s ours am: e5f19ebc -s ours am: 323c5416 -s ours am: b2b94472 -s ours

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

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

Change-Id: I5e6c9831927b16f94e51f9cdb31165c6096f9ecf