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: 44495e8e am: 81108975

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

Change-Id: I1871d1a31b5448cef94729c1d2b4e5fcbe55a4ca