Merge \"Change vector setup check to use non-themed drawable\" into nyc-support-24.1-dev
am: e78fa64757

Change-Id: I8ada0ab8e432125d3c29ea7aaf15c9b3d3ec4875