Merge "Fix 5185505: Update DevicePolicyManager to support weak biometric security."