[automerger skipped] Revert "Add configuration for network capabilities that...

[automerger skipped] Revert "Add configuration for network capabilities that would be..." am: d0677e96 -s ours

am skip reason: Merged-In Ie27eb2149aaabff97cf72a032265523a807a82fd with SHA-1 66223039 is already in history

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



Change-Id: I8cb2cc836c39952a0924856e2303041ed0fd8754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>