Merge "Fix a potential thread safety issue in VectorDrawable" into rvc-dev am: d93d1d64 am: cd6b2f96

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

Change-Id: I51f7ef634d5db2e49bfee37bdf055e919ca7837c