Merge "Deprecate internal Calendar methods."
am: e08bd750c8

Change-Id: I1cdcfa55a83f414fa8b0b72e2b9520e905d752ff