Merge "Replace hidden API usages of NetworkCapabilities" am: 3972f1c61c

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

Change-Id: I16b2a1e7aaec191dacbffa077ced459d1024370f