Merge "Null check color_space_ptr in draw functor v2" into sc-dev am: de41c86deb am: 166bce8225

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

Change-Id: I5a541344971117b9dae52b1f715ca26eec7d78a3