[automerger skipped] Update DeskClock to be compatible with latest Jetpack libraries am: f8de6a6c42 -s ours am: 40da11fe13 -s ours

am skip reason: Merged-In I8cbb5dfb3d967e8a1e6c80dcc430770307a49b1d with SHA-1 8102910e0b is already in history

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

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