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

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

Change-Id: Iea4ca7634dcd2b185ce98e7b8d3c568edeb29a85