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

Change-Id: I8f2870e599af36b3958777aa57645da72fdc9e0d