Merge "Added aconfig flag for TextClassifier choice API" into main