Merge "API to get network visible network capability name" am: 2229a10c7b am: b81fedf587

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

Change-Id: Ia6c65d6cd6d322d5599942ec65323a0d62e4dd1b