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

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

Change-Id: I6b21056d64495e42181e3c8d2a328ef0ac596a45