Merge "Clean up: delete unused methods" am: 41f9566da8 am: b371dea0cb

am: 88cbe51f27

Change-Id: Ib166230d692cc7a3973355239161ed88ffd6af60

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

diff --cc src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
index 4b717e0,0ef01d9..936a4c0
--- 1/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
--- 2/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
@@@ -17,9 -17,7 +17,8 @@@
  package com.android.settings.connecteddevice.usb;
  
  import android.content.Context;
- import android.os.Bundle;
  import android.provider.SearchIndexableResource;
 +
  import androidx.annotation.VisibleForTesting;
  
  import com.android.internal.logging.nano.MetricsProto;