Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
am: 5e94a16b74

Change-Id: I7e4d1044616bdb6e88c96dc1f79ab683b760bc5a