[automerger skipped] Merge "[JS02]Remove hidden API usage of...

[automerger skipped] Merge "[JS02]Remove hidden API usage of NetworkRequest.networkCapabilities" am: 3eee37a2 am: 734f12bc am: f67b44d8 -s ours

am skip reason: skip tag Change-Id I263d2488472dae21e1cdca3760e0127cc0d20de2 with SHA-1 956383c2 is already in history

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

Change-Id: I1e689f36bdf30726017e4f6d89d6beabbdd598f7