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

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

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