Merge "Revert "Polish weather clock Move adding weather placeholder to ..."" into udc-dev am: 8fe93d7040

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

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