Merge "AOSP/DeskClock - Added SET_ALARM permission check"