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

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

Change-Id: I385c0143451c0cdc6f3c0e34843ae212f8661316