[automerger skipped] Merge "Replace hidden API usages of NetworkCapabilities"...

[automerger skipped] Merge "Replace hidden API usages of NetworkCapabilities" am: 3972f1c6 am: 8d219890 am: 0d1c0f6a -s ours am: d1afa8af -s ours

am skip reason: skip tag Change-Id Iaa4e256e43a33bdf08780bdd1a1a8b538058634d with SHA-1 d379cd79 is already in history

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

Change-Id: I93853d734942ff8ea97ca763e393562db20837a8