Merge "Remove MODULE_LICENSE_APACHE2 from CalendarProvider" am: 5ffa3299d2 am: e3d8716228 am: 31adf69cd8

Change-Id: I30cfabc4e8daa918003adf3c7b0453f8316e58c3