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

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

Change-Id: I91e1165e12cff37452477ddacc190cc12603abb7