Merge "Use GregorianCalendar.add() when searching for next alarm."