[automerger skipped] Merge "Move NetworkUtils JNI out of core/jni" am:...

[automerger skipped] Merge "Move NetworkUtils JNI out of core/jni" am: 44862ff7 am: 0386387d am: 1d78211f -s ours am: db36a0e8 -s ours

am skip reason: Merged-In I0b55dfe92f3cb6e848d79ac7953756f39aaa2597 with SHA-1 cdadd64b is already in history

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

Change-Id: If0eb9788e6b6cf3a3e811a6e01d4eaf1084dcf67