Update includes in favor of external/libtextclassifier update

Bug: 119788152
Test: m droid successfully builds + atest frameworks/base/core/tests/coretests/src/android/view/textclassifier + manual testing
Change-Id: I5a2077473460e4dc322bdd08f4e53a749487eaeb
Merged-In: Ia565913f0ec2aa1f36110d8b50d6b778b81c674e
(cherry picked from commit 51cd24c0)