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

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

Change-Id: I654d571d59d8f09426e7271c7d0bbcb5dab25187