Merge "Return null instead of throwing ServiceNotFoundException when VPN_MANAGEMENT_SERVICE is not available." into main