Merge "Fix bug #4972463 Update CTS tests for TextView textDirection"