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

Change-Id: I78c2143c1fed3736cb9bd8714b12dd829b4dcaeb