Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev am:...

Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev am: 547df6be am: 419bd64b am: 6b905ded am: c13511c4 am: 3a190e00 am: 73ac2ec2

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

Change-Id: Id5f484d23f9a4d70729a4262e3e34a7c4f55c056