DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am: e79c73d626 am: 4baa901205
am: c644228110  -s ours

* commit 'c64422811060548ac9f754b12b2ce23ed81b1fe0':
  DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.