Merge "Remove usage of NetCapability" am: bd3110f654 am: dd7445523b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0407079209842c317353e1e75391f949608b99bd