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

[automerger skipped] Merge "Remove underlying network caps" into sc-dev am: c52419c6 am: e457785e -s ours am: b130a6e9 -s ours

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

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

Change-Id: Ia5f8fa1b320a50e2f444668da6da8e92905dc84c