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

* commit 'e30df6fcedfd5ccaa35315ea79b17aab4677fb1e':
  Save interactive/screen-on state in KeyguardServiceDelegate