Merge "Add the tethering type to TetheringEventCallback methods"