Merge "Shell: Grant CACHE_CONTENT to Shell"

    <!-- Permission needed to test tcp keepalive offload. -->

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

    <!-- Permission required to test ContentResolver caching. -->

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

    <application android:label="@string/app_label"

                 android:defaultToDeviceProtectedStorage="true"

                 android:directBootAware="true">