Merge "Add common parameters to reduce duplicated code" am: 0ce40ac75d am: 5431ee443e am: 1ece2f8943

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

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