Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev