Merge "[CS04]Remove hidden API usage of NetworkCapabilities" am: ec30b1105c am: 95b4551f21 am: 14b1223ce8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I722bf04112fd8efd9bf01204c816a66597c186c8