Merge "API level 30 upgrade: AOSP/DeskClock" am: a09d736dc3 am: 3b05661d8f

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

Change-Id: Ie0a588785774124b4ea3ef8c4503bdfb2d0d0f21