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

Change-Id: If5582c95102649dc197402db02d8eaaa5670d99c