Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c am: 39baaf4353

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

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

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

@@ -329,6 +329,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment {
         list.setLayoutManager(llm);
 
         list.setHasFixedSize(true);
+        list.setNestedScrollingEnabled(false);
         mAdapter.setRecyclerView(list);
         list.setAdapter(mAdapter);