[automerger skipped] Merge "Remove most of the NetworkStack dependencies on frameworks/base." into sc-dev am: 46b8e08243 am: d7076ed867 -s ours
am skip reason: Merged-In I72ec43987faf9138cd68dc47c6bf2abe8c67aa38 with SHA-1 bb9bf67591 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15026549
Change-Id: If720cc815aaa4f254dfad5e41509780b48ecfc7a
This commit is contained in: