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