[automerger skipped] Merge "Merge Android R" am: 3ec9749b80 -s ours am skip reason: Change-Id I98721ca64d0d5eedd6380cc382bfdb527a7c1d9d with SHA-1 af5831aee3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/PackageInstaller/+/1422472 Change-Id: I5a14c13587ef535827af6243d263ca1d691c0add