Merge changes I71eb6e23,I6cd669ee into tm-qpr-dev

* changes:
  Fix lint warnings in KeyguardUpdateMonitor
  Fix lint errors in KeyguardUpdateMonitor.