[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 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: I503b3ac8e138b210f0c82e817698588468435ea1