Merge "target-level 4: allow camera provider 2.4-5"

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.camera.provider</name>

        <version>2.5</version>

        <version>2.4-5</version>

        <interface>

            <name>ICameraProvider</name>

            <regex-instance>[^/]+/[0-9]+</regex-instance>