Merge "Update bluetooth strings in settings"

tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java

@@ -94,7 +94,7 @@ public class BluetoothDeviceNamePreferenceControllerTest {
         final Object[] spans = ((SpannableStringBuilder) summary).getSpans(0, summary.length(),
                 Object.class);
         assertThat(summary.toString())
-                .isEqualTo("Visible as Nightshade to other devices");
+                .isEqualTo("Visible to other devices as: Nightshade");
 
         // Test summary only has one color span
         assertThat(spans).asList().hasSize(1);