Merge "Merge "findNetworkStackApk returns an array of files (2/n)" into...

Merge "Merge "findNetworkStackApk returns an array of files (2/n)" into rvc-dev am: bba5d59a am: 89a6147d am: ccf38324" into rvc-qpr-dev-plus-aosp am: 2bf8572e

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

Change-Id: I1ca58c123de88c7f4e193ef97e1081d22ea9a505