Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f am: 6a154c0c am: 4c548ab4 am: 64162814

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

Change-Id: I0d39b8f1d133ff651494baf7c5352be6b6b188e6