Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into rvc-dev am: d93d1d64 am: cd6b2f96 am: 9a8dedd6 am: 6f9e6570" into sc-v2-dev-plus-aosp