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

[automerger skipped] Merge "[Thread] define the THREAD_NETWORK_SERVICE" into main am: 6a6e615f -s ours

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

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



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