Merge "Use GregorianCalendar.add() when searching for next alarm." am: b52de8248f
am: 65a35016c1

* commit '65a35016c1f22805c2e70b49ff2b121b9f7dc739':
  Use GregorianCalendar.add() when searching for next alarm.