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

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

Change-Id: Iaebc207b45b0bf7e697419d2dd0a2a038e78d20f