Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f249209 am: 23d31b02 am: 952d747c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2b32d56b4a00608b226c1d9b87b4e5b7818bd86