[automerger skipped] Merge "API to get network visible network capability name" am: aac4d3242a am: 238cd3344e am: ea1a278478 -s ours

am skip reason: skip tag Change-Id Iae63ac4d62641cee2bd0f0c5f50dd729750d514c with SHA-1 34fbbbb6b9 is already in history

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

Change-Id: Ia36214cc8bf32e5b39d27f55d5e7eb4ac3c22c84