Merge branch 'temp_72223856' of persistent-https://android.git.corp.google.com/platform/external/libtextclassifier into merge1

Change-Id: I4915a91a0e2479a6ede8438c225525849d1ed8bd