Merge \\"Disable constant state sharing for VectorDrawable\\" into nyc-dev am: f66bdf9b57
am: a75526bd11

Change-Id: I57c5e8728ba22daa08734b59b2808c21dba14e4d