Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev

    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <application>

    <application android:networkSecurityConfig="@xml/network_security_config">

        <uses-library android:name="android.test.runner" />

        <activity android:label="@string/app_name"

                android:name="MediaFrameworkTest"

<?xml version="1.0" encoding="utf-8"?>

<network-security-config>

    <base-config cleartextTrafficPermitted="true"/>

</network-security-config>