Merge "Fix testComplexColorDrawableAttributeInflation" into stage-aosp-rvc-ts-dev