Merge "Merge "Deprecate internal Calendar methods." am: e08bd750c8 am: 5144cd445a am: 30ce9c07ec" into oc-dev-plus-aosp
am: 8b2caae395

Change-Id: I7ef1ace4a696dc5b57ad42b7756e0e3a6efa5c83