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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b7028aa8bb303edf27f4ff93f54a753d0b4ee78