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

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

Change-Id: Id646320b7ffffc237658c5c5df612cdf8d4831eb