Merge "TextClassificationManager API updates." into oc-dev
am: dada7c0e71

Change-Id: Idcd8fd7413b4fd187b3ffa893250b33754f0e962