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

Change-Id: Iaf6cdfd3e6b7ec6a1e1d37cc200b196d105f1ef7