Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev am: c2ec3f1bbe am: f61708617c
am: 2c8f42d730  -s ours

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