Merge "unit test of offernetwork and unoffernetwork" am: c6c4dc719f am: a105e1b667

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

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