Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am:...

Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f am: 6a154c0c am: 4c548ab4 am: 64162814 am: 1b692301 am: 92bb88ab am: 6d4e36e6

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

Change-Id: I974ba0a6e566f023aaeacc411e75c1696603c8eb