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

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

Change-Id: If09de67852c0f06bd059990bf3d37c7d5fb07b90