Merge "Move shared methods to NetUtils" am: ac148e6bfe am: 60de0b8a53

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1571849

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b50a89e90fa8c27a1cb653fff38ec8c6338ad5d