Merge changes from topic "presubmit-am-5cb98b83274540c4ab7f7303dcd08e5a" into tm-mainline-prod am: 3b32880853

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/17392093

Change-Id: Ice2030ba86f4296e4f4ebb588461889ba41fa25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>