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

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

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