Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880617

Change-Id: Ie4b09f27e277c416d0f3ae8c58d05afa0390b429