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

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

Change-Id: Ie7c1726aca8e51f67dd777a417c0f30492c1b8fc