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

Change-Id: Iab9dd6b5bc8fdcb8cbe1150748dfc67fcc304bf8