[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: bd5ecb11d4 am: c5a84ab121 -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: I95167ae49604c940d8b800556e0140b58a394ceb