Merge "Merge "Null check color_space_ptr in draw functor" into sc-dev am: 717af18b am: e6eafafe" into sc-v2-dev-plus-aosp am: b4edc615

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

Change-Id: I49c03f79a13a67174ae4ebfdbdb27a6cb429f057