[automerger skipped] Merge "Replace hidden API usages of NetworkCapabilities" am: 3972f1c61c am: 8d2198902b am: 0d1c0f6a71 -s ours

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

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

Change-Id: I46c983d9d8901ed7d0efb084ba8a7112b9bea7fe