Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev...

Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev am: 0b82bf9d am: 8bb49c90

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

Change-Id: Ic6c1efe682ed768994f189cc7cbaea99d972de27