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