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

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



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