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

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

Change-Id: Ib616d7907ea245fbbe5e1bd5457e7f6ae5dbe3e4