Merge "When a pinned file is a jar or apk, ask the runtime for other files."...

Merge "When a pinned file is a jar or apk, ask the runtime for other files." am: 03faaa58 am: c17f1064

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

Change-Id: Iee6d1f3bad1c34790af3c954a29aaaebcb00d69c