[automerger skipped] Merge Android 12L am: b7cf62f640 -s ours

am skip reason: Merged-In I0905ed58461fefec1e86b49cd93769c25b65f58e with SHA-1 b477ed5932 is already in history

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

Change-Id: Icb8c9b93bc2945519ad61cd3d2926133b92f8592