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

Change-Id: I43f896443fd0b36d3538b242bdaa859181eb8eee