Merge \"Use a new drawable for constant state test\" into nyc-support-24.1-dev
am: 1c82fff407

Change-Id: I2b6c43ec6f8772266c3892dd2773b36366440d09