Merge "Merge \\"Fix TintContextWrapper not always handling vector assets DO NOT MERGE ANYWHERE\\" into nyc-dev am: 1e87f4ec3f  -s ours am: e8596ba982  -s ours" into nyc-mr1-dev-plus-aosp