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

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