Merge "Add HAL for pdu session id support"