[automerger skipped] Merge "NetworkService: quitSafely() on onDestroy()" into...

[automerger skipped] Merge "NetworkService: quitSafely() on onDestroy()" into tm-qpr-dev am: b3918d9c -s ours

am skip reason: Merged-In I25d968867401bd7d285735c83c71e3649467c5db with SHA-1 24e7f904 is already in history

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



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