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

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

Change-Id: I45902e654b93e66b1bcec8d4b12eb758b5a0a245