Merge "Use Locale default temperature unit in wallpaper picker" into udc-dev...

Merge "Use Locale default temperature unit in wallpaper picker" into udc-dev am: 36677453 am: e5bfb7f6

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



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