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

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