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

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

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