Merge "Add support for TAP interfaces in TestNetworkManager." am: 144e714d79
am: 878d818c63

Change-Id: I29daac925c4b64bda111ba187b1759b6ce8a5f23
tree: 23f40183cc9fe003022ef690beb131f37cac3688
  1. core/
  2. services/
  3. tests/