Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9 am: 916110007d am: 9ad53e4e89

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

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