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

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

Change-Id: I9b86456ee858390dee55ad6959dfeb0c7300a514