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

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

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