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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90d710054ef6b0a17c4a0511f941fc86af2d59b2