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

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

Change-Id: I61451ebe5f6ed25a0d3f75f939c73efb9f942c8b