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

Change-Id: I1fa0a01542ba554e382f91758a4f0200bbc0295e