[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 2d1b88c539 am: 01c0f51e45 -s ours am: de98804062 -s ours am: 574d1b7bd6 -s ours

am skip reason: Change-Id I42fd0c1e3eb37654bb1cca849337008f726309e8 with SHA-1 0baa475205 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/PackageInstaller/+/1431568

Change-Id: If3409fc7dd47aa8345de4ac32b6e4d8b86cd2b93