Merge "Hide TextClassifier.EntityType from the public API." into oc-dev