Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev
am: 6c917901cf

* commit '6c917901cf4e6f64300398f564436a7d1fc18b10':
  Fixing a NPE in DevicePolicyManagerService

Change-Id: I540f2d5e490e70c19e5e8d8926010bbcb1431048