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

Change-Id: I77939a9720058bab268e40d4be8622da308a40c1