[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: fc79a5cc6f am: 0789821366 -s ours am: 3688a49a4f -s ours

am skip reason: Change-Id I42fd0c1e3eb37654bb1cca849337008f726309e8 with SHA-1 de7adaf69d is in history

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

Change-Id: I6a192adee8a14c5c095691cbafe72ebfd39da8c3
tree: 4339ad9c7863e0da815af56128d17ad6adcfb0d4
  1. PermissionController/