[automerger skipped] [Thread] define the THREAD_NETWORK_SERVICE am: 5996288d...

[automerger skipped] [Thread] define the THREAD_NETWORK_SERVICE am: 5996288d -s ours am: d33df3ca -s ours am: 9c018c35 -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: I5425ff94ea462af2a23d54aa0048a4bd9756026d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>