Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"

            <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />

        </receiver>

        <receiver android:name=".bluetooth.BluetoothDiscoverableTimeoutReceiver">

        <receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver">

            <intent-filter>

                <action android:name="android.bluetooth.intent.DISCOVERABLE_TIMEOUT" />

            </intent-filter>