[automerger skipped] Merge "Move NetworkUtils JNI out of core/jni" am: 954385ffac am: 3c157047e2 am: d76107e54f -s ours

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

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

Change-Id: I3724d722bc66d3c54fe1c8cebacc65c3c097e5f8
tree: af7dfaf882e7eaf5364700faa973e9380124abb8
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING