Merge "Do not run dpm.resetPassword() in keyguard disabled test" into nyc-dev