Merge "Fix CTS flaky TextClassifierServiceSwapTest." into rvc-dev