Merge changes from topic "biometric-unlocked-required" am: c36995ec84

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

Change-Id: I1bcdf2d01a8f4b81f1ebdc0e475db461c390bda6