Merge "configstore@1.2: remove requirement"

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.configstore</name>

        <version>1.2</version>

        <version>1.1</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>