Merge branch 'lineage-17.1' of https://github.com/LineageOS/android_packages_apps_Calendar into int/10/fp2

Issue: FP2A10-174
Change-Id: I83f1a38c6982b242fb540287b86fa30951422f9f