[automerger skipped] Merge "Remove most of the NetworkStack dependencies on frameworks/base." into sc-dev am: 46b8e082 am: e2bc569e -s ours

am skip reason: Merged-In I72ec43987faf9138cd68dc47c6bf2abe8c67aa38 with SHA-1 bb9bf675 is already in history

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

Change-Id: Ic80ab4fc772583972e30badc9fa7fbbf128be650