Merge "TestNetworkManager: add support for configuring tap link addresses" am: e548be264b am: 2910066537

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2142792

Change-Id: I7725cf030dbb0e9f549558d730c755befec4f862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>