Merge "Deskclock - set target sdk version to 30." am: b756742520 am: b21830e11a

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1930621

Change-Id: I5f48610c70bb6d5d5df2823859cab098a1f86045