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

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

Change-Id: I66f3fbfe2e85642506cc9ecaf8e4805863744a64