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

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

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