[automerger skipped] Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e33269 am: 6d208315f8 am: 3e876a2147 -s ours

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

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

Change-Id: Icef19df8c50013e369dcecba883928787ea20733