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