Merge "Remove MODULE_LICENSE_APACHE2 from Telephony" am: 5f39c80630

Change-Id: I3d952e2941daffc8c543fba621cfcbc2063ca209