Merge "Remove MODULE_LICENSE_APACHE2 from CalendarProvider" am: 5ffa3299d2

Change-Id: I63b9c70b689ab823b6a4f08a0d895a3a28953222