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

Change-Id: I0e6671f193ff8af3e0361bda179ca233ec13e236