Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am: f159b74608

Change-Id: I83edfb392f0f179b4c28aaab3eba0c51fe11d207