Merge "Merge \"Merge \\\"Disable constant state sharing for VectorDrawable\\\" into nyc-dev am: f66bdf9b am: a75526bd\" into nyc-mr1-dev-plus-aosp am: c569cc7d"