Merge "Add support for TAP interfaces in TestNetworkManager." am: dc7b7de85c
am: ba2eb5e062

Change-Id: I29daac925c4b64bda111ba187b1759b6ce8a5f23