Merge changes from topic "biometric_settings" into sc-dev am: 801ff1c4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14170584

Change-Id: I7f2605480cd3d4a3b929e7b1de9b2dcb5f1670ee