Merge "Add a unit-test for TelephonyProvider"