Merge "TextClassifier CTS improvement: wait deviceconfig propagate" into sc-dev