[automerger skipped] Merge changes from topic "remove-fde" into sc-v2-dev-plus-aosp am: a00c327707
-s ours am: e92bac3118
-s ours am: 16808d4a63
-s ours
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 b4060ef65b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17110591
Change-Id: I8ab712872b27cf964b9fe7fbd6accf5028bebe91
This commit is contained in: