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

Change-Id: I20e41c6ebbac82fd70ae3d724e484eac78d2b308