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

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