[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 0f4d9cab2b -s ours am: 5681b91b64 -s ours

am skip reason: Merged-In I1558ea1525a82d50919b9a3615b05e32451aa17f with SHA-1 674e9ea3d4 is already in history

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

Change-Id: Ifeb3f21d3d71640614ec175a5103e2a1ba35af91