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

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

Change-Id: I812d9591b9263aaa01b95d8fbb75ab9cbe38cffe