cLock: refactoring (no functional changes): moved CalendarInfo.java

Change-Id: I3f9ed6d70bfa1ca4d5b6f72913115048efa8a1e3
Merge remote-tracking branch 'upstream/cm-10.2' into dark-jelly-cm-10.2