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