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

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

Change-Id: I2c7e8050ca82f81ca865a76bd11a39d82eb09dcc