Merge "Update screen lock and biometrics options in order" into udc-qpr-dev...

Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d am: f0278e68

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



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