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

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

Change-Id: I06648c79e4e3e5813be01fa7ea6eca3185a13021