[automerger skipped] [Thread] define the THREAD_NETWORK_SERVICE am: 5996288d67 -s ours am: d33df3ca54 -s ours

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

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

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