Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f3b am: 6a154c0cb5

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

Change-Id: I72ce4704835fc8b042fc38f5f0fd2670414ff5f7