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

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