Merge "[Regional Pref] Fix the line break in the temperature" into udc-dev am: ecfd9d1c

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



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