Merge "Remove usage of hidden NetworkUtils from Formatter" am: ea47f9ee6c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23fc562f1d5c454fac6c51398d637a8964e22f08