Merge "Use static utils from f/l/n instead of the networkstack" am: 1b05dfe00d am: a2e71597bf am: be2b59b841

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

Change-Id: Ic1446a482f4a515d9ac16f76d0b8c3ebf73fe187