Merge "AOSP/Calendar: bump target API level." into main