[automerger skipped] Merge "Remove underlying network caps" into sc-dev am:...

[automerger skipped] Merge "Remove underlying network caps" into sc-dev am: c52419c6 -s ours am: 861338c2 -s ours am: f07c7293 -s ours

am skip reason: Merged-In Ic2fec8a87fd19a1780333c61759c4092598d349e with SHA-1 4ab47dec is already in history

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

Change-Id: I429690adab5ea9b9f82dc871d87b6250c36367cb