[automerger skipped] RESTRICT AUTOMERGE resolve merge conflicts of a35f1536 to qt-qpr1-dev am: 35337c19 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8412b9d190f09fecc3e056d7b11c46be9f1225e9