Merge "Do null-checks before accessing VpnManager in DevicePolicyManagerService" into main