Merge "Delete NetworkManagementSocketTagger." am: c2d8b9b074 am: b12be450bb

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

Change-Id: I23e1a37a8a972623a48e2527e806a197d0c769a0