Merge "Remove network capability from CAPABILITY_ALL constant." am: 9ffb8a6bc6 am: bae26c2434

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id47ab43ab3265371371195ce00d7e5cb6aa551cc