Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f am: 23d31b0274

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6d8d56a79bd7f8751c3604a292f2bb8c34fd765