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

Change-Id: Ie1b7955579e5753aab54ab476e7d0d79c31afe9c