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