Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f am: 6a154c0c am: 4c548ab4 am: 64162814 am: af4fa84b" into sc-dev am: e01f6558 am: 7cb858ce

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

Change-Id: I05fcac817d4f9851c7d71b27593045fc4d03969d