Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_DeskClock into leaf-3.2

Change-Id: Id5f4fbf0e80be90213268cdc62eb7b352c79b7c2