Merge "Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f am: 6a154c0c am: 4c548ab4 am: 64162814 am: af4fa84b" into sc-dev am: e01f6558 am: 7cb858ce" into sc-v2-dev-plus-aosp am: 9b6005ca

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

Change-Id: I6cbc863e7a9d8615c515d8ecea152d9c4e9c00db