Merge "Fix 5783857: Device Policy Manager doesn't allow Face Unlock"