Update CalendarProvider to oxygen_1006

Change-Id: Ifadf21027dcf51792b17f224285ad7520024f175