Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency" am: 914ef6bb34

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

Change-Id: I5d03886f8cb0831cd7629aa19d4a20d04bc68b96