[automerger skipped] Merge "Remove underlying network caps" into sc-dev am: c52419c68a -s ours
am skip reason: Merged-In Ic2fec8a87fd19a1780333c61759c4092598d349e with SHA-1 b2632543c0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14718522
Change-Id: Ida01eec706509935ad815c55cd6ab1621a4d06cf
This commit is contained in: