Merge "Merge "Save activity state before stopping acitivity when device...
Merge "Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev am: 8da796d0 am: 1197c16e" into nyc-mr1-dev-plus-aosp
am: 73713dad
Change-Id: I9530fc37e47008d61293610a246a4db1e0d2a6b3