Merge "IMS Connection Capabilities Update" into mm-wireless-dev