Merge "Fix CTS tests for CheckedTextView"