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

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

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