Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency" am: 513d8dd2ac am: c756efe7bd

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

Change-Id: I6f031219bcd375b0ac4ec0819ae3c8341819f555