Merge "Remove MODULE_LICENSE_APACHE2 from TelephonyProvider" am: 905dff6098 am: 7fa89d81d8 am: c975be29a6

Change-Id: I5e74b3572a9d43d8b1f1f55fa0870eb62b3fc9d2