am 43ef1c8c: Merge "Remove deprecated API calls to KeyguardManager from statusbar" into klp-dev

* commit '43ef1c8c34c6dd7c7ae75ac2c1b9bfdc15405b04':
  Remove deprecated API calls to KeyguardManager from statusbar