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

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

Change-Id: I0361c46e304b4c71407175b6833642a1cdac1bca