[automerger skipped] Merge "[Thread] define the THREAD_NETWORK_SERVICE" into...

[automerger skipped] Merge "[Thread] define the THREAD_NETWORK_SERVICE" into aosp-main-future am: 87b981b0 -s ours am: ed60d24c -s ours

am skip reason: Merged-In Iaa1b6973b2fc86886db784e5d37e804daea854e8 with SHA-1 69e0dfab is already in history

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



Change-Id: I659e3b1b5e074e7808229b48432e2c48222fbe88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>