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

Merge "Merge "Null check color_space_ptr in draw functor v2" into sc-dev am: de41c86d am: 2f69ce04" into sc-v2-dev-plus-aosp am: 606ae04e

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

Change-Id: I290b2ec8704e6ace42d64e1e8cae5f54381c404a