Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455 am: 2e440eb0 am: 92ed8250 am: 454c79f7

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

Change-Id: Iabc41f564e58c35701181416d20dcd5496889960