Revert "Remove Calendar & CalendarProvider"

This reverts commit 61d7e2974f7c07801d913223c8cc4495fec141ec.

Change-Id: If5d040e85625593f93e807a147909727d1c64951