Merge changes from topic "presubmit-am-5cb98b83274540c4ab7f7303dcd08e5a" into tm-dev am: af1898118c

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

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