Merge "Fix 5185505: Add support for weak biometric sensors to lockscreen."