Merge \"Fix backwards-compat tinting for compound drawables\" into nyc-support-24.1-dev
am: 1b9fe59efa

Change-Id: If6c7c6ff44f4eaa21525eb0ba797d0d3e8d7e84c