Merge "Remove MODULE_LICENSE_APACHE2 from TelephonyProvider" am: 905dff6098

Change-Id: Ib5e274fa2c161ba89a7e1315758bbea6eab2f7b9