Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
am: 5b26562be8
am: 0e59b1cd15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981 Change-Id: I1d53af2589536035ed4cb45aee12f8a0385d6374 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: