Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455f2

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

Change-Id: Iedc452ae575a64585eab01961815f35a62b52f06