Merge "Revert "Mark Bluetooth as required for all profiles""

        android:name=".btservice.AdapterApp"

        android:icon="@drawable/bt_share"

        android:persistent="false"

        android:label="@string/app_name"

        android:requiredForProfile="all">

        android:label="@string/app_name">

        <uses-library android:name="javax.obex" />

        <provider android:name=".opp.BluetoothOppProvider"

            android:authorities="com.android.bluetooth.opp"