Merge "Update AppCompatSpinner popup color tests"