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