Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455 am: 2e440eb0 am: 92ed8250 am: 454c79f7 am: 9ed0a054 am: babf7fab am: f1d8c72d am: 5f26ddea" into sc-v2-dev-plus-aosp am: c366a18c

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

Change-Id: Ib52b3d2add49addccc86e1e37dd43b18aff4adb7