Merge "Save activity state before stopping acitivity when device sleeps am:...
Merge "Save activity state before stopping acitivity when device sleeps am: b5066fe3 am: 3adb9d93" into nyc-mr1-dev-plus-aosp
am: 30ed89db
Change-Id: If4ac3e0cbb086d92edc049dc9e427202d5b38e89