Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev