Snap for 7783058 from b75781c7bc to sc-v2-release

Change-Id: I0788f201a17ba16787efadf47d7c5a1295bdbe8d

src/com/android/settings/TetherSettings.java

@@ -55,6 +55,7 @@ import com.android.settings.core.FeatureFlags;
 import com.android.settings.datausage.DataSaverBackend;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.wifi.tether.WifiTetherPreferenceController;
+import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.TetherUtil;
 import com.android.settingslib.search.SearchIndexable;
@@ -425,14 +426,16 @@ public class TetherSettings extends RestrictedSettingsFragment
 
     private void updateUsbPreference() {
         boolean usbAvailable = mUsbConnected && !mMassStorageActive;
+        final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =
+                checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId());
 
-        if (usbAvailable) {
+        if (enforcedAdmin != null) {
+            mUsbTether.setDisabledByAdmin(enforcedAdmin);
+        } else if (usbAvailable) {
             mUsbTether.setEnabled(!mDataSaverEnabled);
         } else {
             mUsbTether.setEnabled(false);
         }
-        mUsbTether.setDisabledByAdmin(
-                checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId()));
     }
 
     @VisibleForTesting

src/com/android/settings/search/SearchFeatureProvider.java

@@ -104,7 +104,7 @@ public interface SearchFeatureProvider {
             FeatureFactory.getFactory(context).getMetricsFeatureProvider()
                     .logSettingsTileClick(KEY_HOMEPAGE_SEARCH_BAR, pageId);
             final Bundle bundle = ActivityOptions.makeSceneTransitionAnimation(activity).toBundle();
-            activity.startActivityForResult(intent, REQUEST_CODE, bundle);
+            activity.startActivity(intent, bundle);
         });
     }