am 7de9fbca: am 2364af20: Merge "Save interactive/screen-on state in...
am 7de9fbca: am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev
* commit '7de9fbca':
Save interactive/screen-on state in KeyguardServiceDelegate