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

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