Merge "packages/providers/CalendarProvider: Set LOCAL_SDK_VERSION where possible." am: ff030e8884
am: 9e831292f2

Change-Id: I79b6cf1fb54b21f09402eaf2a01f6a557618ee06