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