Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455 am: 2e440eb0 am: 92ed8250 am: 454c79f7 am: 9ed0a054 am: 06254a7b am: 4c7ddfbe am: bcc248eb am: ca58ea19

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

Change-Id: I7e3a3dd1fbeb77e61d4c6fa7866ae0b70f390eb9