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

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

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



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