Merge "Add new DevicePolicyManager disable flags for keyguard."