Merge "Export libtextclassifier am: 1ac2e4ab8d am: 1449b244d5" into rvc-d1-dev-plus-aosp