Merge "[automerger skipped] Merge "Skip test case for ColorStateListDrawable on automotive device" into android10-tests-dev am: 1040d68e8e -s ours" into android11-tests-dev