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

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

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