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

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

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