Merge "Fix UI issues in localization" into main am: ce20ff98e3

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

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