Merge "Save activity state before stopping acitivity when device sleeps am: b5066fe307 am: 3adb9d9318" into nyc-mr1-dev-plus-aosp