Merge "Merge \\"Revert \\"Don\\'t re-launch activities while the device is sleeping\\"\\" into nyc-dev am: beaf3707fa am: 96eea7136a" into nyc-mr1-dev-plus-aosp