Merge "Removed redundant face unlock option." into tm-qpr-dev am: 02ca9bd2

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



Change-Id: I1ad6fb329ecfdcffcecd8bb80b6d300b7bc9e0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>