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

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

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