Merge "Do not call into ActivityManager from DPMS within DPMS lock"