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

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