Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev am: 547df6be1e am: 419bd64bc4

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

Change-Id: I81b95db1d94ea8b5ead40f58dc4cd9147e1be22b