[automerger skipped] RESTRICT AUTOMERGE am: 36409f23 am: 28ac5cd6 am:...

[automerger skipped] RESTRICT AUTOMERGE am: 36409f23 am: 28ac5cd6 am: c7f24950 -s ours am: 82c2241d -s ours am: 30cbe3f2 am: 4d318e43 -s ours am: da52074c am: be797ade

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

Change-Id: Ia8e8e65876db237378378e58a69070c300d662c1