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: I44164044e04dd881db66e54beff68883398d2a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>