Merge "Do not use content light level if it's 0" into rvc-dev am: 1bb400d7

                .minLuminance = hdrStaticInfo->mastering.minLuminance,

            };

            hdr.validTypes = HdrMetadata::SMPTE2086;

            hdr.smpte2086 = smpte2086_meta;

            // If the content light level fields are 0, do not use them, it

            // indicates the value may not be present in the stream.

            if (hdrStaticInfo->maxCll > 0.0f && hdrStaticInfo->maxFall > 0.0f) {

                struct android_cta861_3_metadata cta861_meta = {

                    .maxContentLightLevel = hdrStaticInfo->maxCll,

                    .maxFrameAverageLightLevel = hdrStaticInfo->maxFall,

                };

            hdr.validTypes = HdrMetadata::SMPTE2086 | HdrMetadata::CTA861_3;

            hdr.smpte2086 = smpte2086_meta;

                hdr.validTypes |= HdrMetadata::CTA861_3;

                hdr.cta8613 = cta861_meta;

            }

        }

        if (hdr10PlusInfo) {

            hdr.validTypes |= HdrMetadata::HDR10PLUS;

            hdr.hdr10plus.assign(