Merge "Fixed leak and no clock carousel (1/3)" into udc-dev am: 50006fef am: 56d4e5ca

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



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