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

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

Change-Id: I3e6e0f7a3b47215f5a5dd577a729af11cbda0cc0