[automerger skipped] Merge "Add TEST_NETWORK_SERVICE to module API" am:...

[automerger skipped] Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e332 am: 6d208315 am: 3e876a21 -s ours am: 698a5294 -s ours

am skip reason: skip tag Change-Id I0690251ddfcdaa8a34830e110b75869a370de389 with SHA-1 d31b3521 is already in history

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

Change-Id: Ibfa5d33d267992957899815c7ff46943d94a8279