Merge "Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent" into nyc-dev