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: 6f9e6570" into sc-v2-dev-plus-aosp am: f65da0d2

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

Change-Id: I58a1d90334fcf81dcabf0b4121e0eadfd002d5c6