Merge "Delete NetworkManagementSocketTagger." am: c2d8b9b074 am: b12be450bb am: 1c1d3ae997 am: af9e6350a7

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

Change-Id: I1da827735db304f192083800a604894dd532a8af