Clean up: fix incorrect @VisibleForTesting imports

Test: rebuild and robotests
Change-Id: I33d7ee1c0622c01f592920baaf01d44ad19d9a13

src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java

@@ -20,7 +20,6 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.util.Pair;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.widget.EntityHeaderController;
@@ -30,6 +29,7 @@ import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceScreen;
 

src/com/android/settings/bluetooth/BluetoothEnabler.java

@@ -25,7 +25,6 @@ import android.os.UserManager;
 import android.provider.Settings;
 import android.widget.Toast;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.widget.SwitchWidgetController;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -34,6 +33,8 @@ import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
+import androidx.annotation.VisibleForTesting;
+
 /**
  * BluetoothEnabler is a helper to manage the Bluetooth on/off checkbox
  * preference. It turns on/off Bluetooth and ensures the summary of the

src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java

@@ -35,11 +35,12 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
+import androidx.annotation.VisibleForTesting;
+
 /**
  * A dialogFragment used by {@link BluetoothPairingDialog} to create an appropriately styled dialog
  * for the bluetooth device.

src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java

@@ -18,7 +18,6 @@ package com.android.settings.bluetooth;
 import android.content.Context;
 import android.view.View;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -34,6 +33,8 @@ import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 import com.android.settingslib.widget.FooterPreference;
 
+import androidx.annotation.VisibleForTesting;
+
 /**
  * PreferenceController to update of bluetooth state. All behavior except managing the footer text
  * is delegated to the SwitchWidgetController it uses.

src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java

@@ -24,13 +24,14 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
+import androidx.annotation.VisibleForTesting;
+
 /** Implements an AlertDialog for confirming that a user wishes to unpair or "forget" a paired
  *  device*/
 public class ForgetDeviceDialogFragment extends InstrumentedDialogFragment {

src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java

@@ -20,12 +20,13 @@ import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.Bundle;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
+import androidx.annotation.VisibleForTesting;
+
 /** Provides a dialog for changing the display name of a remote bluetooth device. */
 public class RemoteDeviceNameDialogFragment extends BluetoothNameDialogFragment {
     public static final String TAG = "RemoteDeviceName";