Merge mainline-release 6664920 to master - DO NOT MERGE am: bd5ecb11d4

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

Change-Id: Ied980bf869bc8302a804053732d1c215c2a23679