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

Change-Id: I834ba4b939f67ff3e1c84a39844085dccc1d8d8e
tree: 5bd53152a6bf09d8299738c73337e75613f2c06e
  1. core/
  2. services/
  3. tests/