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

Change-Id: I73c565cd69367cd7075c70cfa30d7f09c70acac0