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

Change-Id: I834ba4b939f67ff3e1c84a39844085dccc1d8d8e