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

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

Change-Id: I7489ab210e99e9dffcbba8c41f1da89c8f448c09