am 0e58b6ab: am 1a55dcce: am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev

* commit '0e58b6abbe36af3777c3e57cd34828fa2cd684ba':
  Fix a NPE in device policy manager service.