Merge "Reduce duplicated code" am: 1d04d8362f am: f74a08823e am: a6eb8fbdf6

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

Change-Id: If7fac1fba946a32b8c3e94840fc51672ff1920e7