[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 6ec6bf7c8b -s ours am: 0baa475205 -s ours am skip reason: Change-Id I929cfc3549e4b5790a15b08f5a618d03f9987ae3 with SHA-1 3c04de1557 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PackageInstaller/+/12579360 Change-Id: Id6aaf0380f4ea8089ea3e4a52033f597038b0abc