Merge "TextClassifier API updates." into pi-dev
am: bf9dfb16be

Change-Id: I11d37c920abb4aa1fbd5022f30a10fdbe8efe997