Merge "Adjust clock carousel guideline margin" into udc-dev am: c424efb6 am: f89b30d6

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



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