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

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