Merge "Fix a potential thread safety issue in VectorDrawable" into sc-dev am: 6a31678645

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

Change-Id: I1749d307d5a560f53e090bcd40020b9a3899957a