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

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

Change-Id: If5cd61c2140164de92c65a297339cb5b7d563377