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

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

Change-Id: I256fca06682015dbb4ae06defbbff432c7189613