Merge "Remove configstore from compatibility_matrix.5.xml" into rvc-dev am:...

            <instance>default</instance>

            <instance>default</instance>

        </interface>

        </interface>

    </hal>

    </hal>

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

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

        <version>1.1</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <name>android.hardware.confirmationui</name>

        <name>android.hardware.confirmationui</name>

        <version>1.0</version>

        <version>1.0</version>