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

* commit '1024e3a061de32a93d886814ed288dd18650a409':
  Fix a NPE in device policy manager service.