[automerger skipped] Merge "Remove network capability from CAPABILITY_ALL...

[automerger skipped] Merge "Remove network capability from CAPABILITY_ALL constant." am: 9ffb8a6b am: bae26c24 am: b3cb4e56 -s ours

am skip reason: Change-Id I888764ff22fba92fe2cccf3d8442ed318a19ad2a with SHA-1 6831749c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I607406d9d4a5c13cf339fbab63b32d5674d34aae