Merge "Add INVALID_STATE to list of errors for when there is only one modem available"