Merge "Declare new textclassification system service." am: 5470aefbe8
am: 0db7aae1c3

Change-Id: I191e6bc530fc735167c8d364c552bd2e6e099f9d