Merge \"Merge \\\"Don\\\'t take the DPMS lock in...
Merge \"Merge \\\"Don\\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\\" into nyc-dev am: 5e94a16b am: e220722b\" into nyc-mr1-dev-plus-aosp
am: 5d4c54f5
Change-Id: If8610b5efc9895629fe37375b181bbe7e64ba389