Merge "Move shared methods to net shared lib" am: 36c58380fe am: 0367f91058

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09beedc0e71685bba4fa6dc5cc80907ec923b684