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

Change-Id: I7ef2745dedaf26f8bfae9d4e8257032d9d294dcb