[automerger skipped] Merge Android U (ab/10368041) am: 6b4d6cc13f -s ours am: 201a1ce0d2 -s ours

am skip reason: Merged-In Id66dc5b07792ad3c94473734760f952ad81e8e5b with SHA-1 64c179280c is already in history

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

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