[automerger skipped] Use new NetworkCapability API am: 4ba10694 am:...

[automerger skipped] Use new NetworkCapability API am: 4ba10694 am: 43ac867d am: edd0034a -s ours am: ba936b33 -s ours

am skip reason: skip tag Change-Id I732a7251621d8c00515aed7a9ddb337a55561b39 with SHA-1 a769b8a2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1654428

Change-Id: I64985324d686087da3d637c0e01c995852b13531