Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev am: 547df6be am: 419bd64b am: 6b905ded am: 159bc53c" into sc-dev am: 227a9646 am: 605876df

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

Change-Id: I003f36342ebab7e94803cd733e13b59d178bad68