[automerger skipped] Merge Android 12 QPR1 am: d0c6a36466 -s ours am: 4d84988c67 -s ours

am skip reason: Merged-In I9cd90c41580c81a25b3ee3329f9f056246b184cd with SHA-1 593b3b6002 is already in history

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

Change-Id: I3948868c5f888595280a24821be4fd068802413a