[automerger skipped] [Thread] define the THREAD_NETWORK_SERVICE am: f5af1f32...

[automerger skipped] [Thread] define the THREAD_NETWORK_SERVICE am: f5af1f32 -s ours am: 9dc62877 -s ours am: 00c68398 -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: Id8c1144fb04409b16064b2702a14ad70d9143aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>