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

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

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