[Pnalingual] Resolve code conflict. am: 6436a5aa6f am: 715ebf4705

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Change-Id: I2e252e7b93bc3587fbfeb0e8152fbc16ad6c0f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/localepicker/AppLocalePickerActivity.java

@@ -153,8 +153,8 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
                             View v,
                             Bundle savedInstanceState) {
                         super.onFragmentViewCreated(fm, f, v, savedInstanceState);
-                    mLocalePickerWithRegion
-                        .getListView().addHeaderView(launchAppLocaleDetailsPage());
+                        mLocalePickerWithRegion.getListView()
+                                .addHeaderView(launchAppLocaleDetailsPage());
                     }
                 }, true);
         fragmentManager.beginTransaction()