Merge "Remove MODULE_LICENSE_APACHE2 from ContactsProvider" am: 7979a9f9f0

Change-Id: I3aa208a36a39ee4d590b696e69f5331e73e00292