Merge "Do not parcel legacy TextClassification fields" into pi-dev
am: 6db14d01c2

Change-Id: I8e26ed6f5dceaea509ea8d43c2088018ba4aac8e