Merge \"Merge \\\"Don\\\'t re-launch stopped activities while the device is sleeping\\\" into nyc-dev am: f159b74608 am: 6d296286e4\" into nyc-mr1-dev-plus-aosp
am: c9077221bb

Change-Id: If2a00e182c0e622ac42cad97c2683929afdbb702