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

Change-Id: Id15c28c138026fdf9c5b596fbea3b20f4e7e72c2