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

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

Change-Id: Iaa3ae75c75849189f814ada08d6860792ee4232f