Merge "Add demo clock picker" into tm-qpr-dev am: 5ce6cfd273 am: 682619dea3

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

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