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

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

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