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

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

Change-Id: Ic60a1f3ea4df4179669bc65cf6b20cc9f27217d5