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

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

Change-Id: Iac00482e9e304ff96aaaaaa522fe56e31d21d15d