Merge "Revert "CTS tests for Ripple drawable material next"" into sc-dev