[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: abd1687e05 -s ours am: e3330c6c02 -s ours

am skip reason: Merged-In I14f950e4101027d1a6596fd1c459c4c4440b8379 with SHA-1 84b3aa147e is already in history

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

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