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

Change-Id: Id3cdfb650739e48c6ad168239834d46565835180