Merge "Increase CTS coverage for ColorStateListDrawable"