Merge "TextClassifier: API rename" into oc-dev
am: 093eb12994

Change-Id: Idc047d0aa3a9dea72c703d83e4caf521166d9531