Merge "Deprecate internal Calendar methods." into oc-dev am: ccac69e11a
am: 1691ec9729

Change-Id: Ia0e50ce3a642d24c9a6fc0840a698eb4ee6448cf