Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev am: 8da796d0b8 am: 1197c16ea7
am: c3fcd4630e

Change-Id: Ie6076e9467f8b45bb3048826db77823438ad58a3