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

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

Change-Id: Ia76d1cf3d75f1189be719a9ded3d107ce1fd8221