Merge "Add new "pin complex" type to supported keyguard PINs"