Merge "Allow INVALID_STATE to be returned for setNrDualConnectivity"