tree a218a5c831610cc3ee6b85eae20ea601bbc4d9db
parent 932e6dfaa91d68498b9b45f5e325b1ce05b1bf7e
parent b81fedf58752ed397d92272969f2b6977d64f075
author Sarah Chin <sarahchin@google.com> 1617386208 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617386208 +0000

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