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

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