Merge "Update DPM.setKeyguardDisabled to also dismiss the keyguard"