Revert "Make subsettings display edge-to-edge"

This reverts commit c2a85a374d.

Bug: 132672399
Bug: 132182711
Test: n/a

Reason for revert: b/132672399

Change-Id: Icb34ae5b16b7a32215fe2c1a5f0d0d028c91b2ca

src/com/android/settings/SettingsActivity.java

@@ -35,6 +35,7 @@ import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 
 import androidx.annotation.Nullable;
@@ -50,6 +51,7 @@ import androidx.preference.PreferenceManager;
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.Settings.WifiSettingsActivity;
 import com.android.settings.applications.manageapplications.ManageApplications;
+import com.android.settings.backup.BackupSettingsHelper;
 import com.android.settings.backup.UserBackupSettingsActivity;
 import com.android.settings.core.OnActivityResultListener;
 import com.android.settings.core.SettingsBaseActivity;
@@ -164,6 +166,8 @@ public class SettingsActivity extends SettingsBaseActivity
 
     private Button mNextButton;
 
+    private ViewGroup mContent;
+
     // Categories
     private ArrayList<DashboardCategory> mCategories = new ArrayList<>();
 
@@ -246,6 +250,8 @@ public class SettingsActivity extends SettingsBaseActivity
 
         setContentView(R.layout.settings_main_prefs);
 
+        mContent = findViewById(R.id.main_content);
+
         getSupportFragmentManager().addOnBackStackChangedListener(this);
 
         if (savedState != null) {