Merge "Add common parameters to reduce duplicated code" am: 0ce40ac75d

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

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