Merge changes I6d4f8ec3,Id4c1e86c into pi-dev

* changes:
  Make device discoverable in Connected Devices settings page
  Add bluetooth discoverable footer preference in connected devices page

diff --cc src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index cea258d,fd1ec15..eecbca5
--- 1/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
--- 2/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@@ -30,7 -30,9 +30,8 @@@ import android.content.pm.PackageManage
  import android.provider.SearchIndexableResource;
  
  import com.android.settings.R;
 -import com.android.settings.nfc.NfcPreferenceController;
  import com.android.settings.testutils.SettingsRobolectricTestRunner;
+ import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
  import com.android.settings.testutils.shadow.ShadowBluetoothPan;
  import com.android.settings.testutils.shadow.ShadowConnectivityManager;
  import com.android.settings.testutils.shadow.ShadowUserManager;