Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e33269

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

Change-Id: I78e28855dce5b38785ec60bf1c5489ebf2b98ded