Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 2d1b88c539

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

Change-Id: I1a6b1cf2b4327dc3f8a6f47c929bfeedfc4e9019