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