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

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



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