Merge "AOSP/DeskClock - Move API level 24 for Alarm, Timer and basic functionality to work." am: 6d373cd4c9

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

Change-Id: I65b3f1e5c1d44152c66155ab3402659f036daf76