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

Change-Id: I9740157506da5d7d96ac627dc5c30571991d0a2f