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

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

Change-Id: I6b3b75ddd650fb52983def1c05b581b0048f329d