Merge "Add support for TAP interfaces in TestNetworkManager."