Merge "Move shared methods to net shared lib" am: 14da611403 am: f3e5492c46

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09beedc0e71685bba4fa6dc5cc80907ec923b684