[automerger skipped] Merge "Use Locale default temperature unit in wallpaper...

[automerger skipped] Merge "Use Locale default temperature unit in wallpaper picker" into udc-dev am: 36677453 am: 6325e97e -s ours

am skip reason: Merged-In I826cfb7dd424d776dad5f159341595711cf90727 with SHA-1 a59ac711 is already in history

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



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