Merge "Revert "Add CTS tests for tinting API""