Merge "Polish weather clock Move adding weather placeholder to picker" into udc-dev am: d73f51583d

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

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