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