Merge "Update TelephonyProvider to add group ID."