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

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

Change-Id: Id74accd24ea1899d39d6130882ec67879b460855