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

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

Change-Id: I391328a34e6076ab27ca1b9011908b9f1e6d6a32