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

Change-Id: I255eab1358585094b43d21a21b3feab578a97e4f