Merge "Updated color_conversion_fuzzer fuzz_config in Android.bp file" into main