Merge "Pinned apk file should be put in mPinnedFiles." into main am: 3a542f996d am: 63640e75bb

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

Change-Id: Ibe503a94250ba4e6fb9c873c7d63676545002ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>