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

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

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