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