[automerger skipped] Merge "Enable extservices tests to generate android-mts-extservices as well as android-mts." am: aac9b2a3dd am: 72f992d54d am: 4ea6880f51 -s ours am: 2309bbd1d2 -s ours am: b675b7dd79 -s ours

am skip reason: Merged-In I48e48bdee8957ebbd4c5c3db95854fc0a0cdb13d with SHA-1 758193ee61 is already in history

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

Change-Id: I476b669d6dd1c5f57e48adde04d5a013280749f5