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

Change-Id: I5f76f0854d0831839f87f2faccaba690d864c5b8