[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: b477ed5932 -s ours

am skip reason: Merged-In Ibd1c2ff0d4a1b2ec4f81c99330baa7cbe1ff370f with SHA-1 1cdc24d50b is already in history

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

Change-Id: I8f7f41cbf4ce78ac2b1310e6362a8fe8db74829c