Merge "Allow INVALID_SUB_ID to get Default Phone"