[automerger skipped] Merge Android R am: 0cf39e4cde -s ours am: 153cb48aa3 -s ours

am skip reason: Change-Id I249e6ecc866b68d270cbe6066c8fcc4dfc2364a3 with SHA-1 57370d7fdc is in history

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

Change-Id: Ifaab2241fc198b03d4503aeea5c250792c7233c9