[automerger skipped] Merge "Move NetworkUtils JNI out of core/jni" am: 8842198f2e am: ba0f6837cc am: 169d66303b -s ours

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

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

Change-Id: I3724d722bc66d3c54fe1c8cebacc65c3c097e5f8
tree: e6b0c9cb56e733edbc1ee0b85761e9cbcdf466cd
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING