Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 50d02a33ad

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

Change-Id: Ie15d4d9d2e8239f89d0561dd22863726d732ab3c