[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: c560920d96 -s ours am: 32d9b44447 -s ours

am skip reason: Change-Id I7499e0c6e6d7b1c771196c88b8bb898cd61e77dc with SHA-1 e1b98294a9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d098c1059069f424b910d487ff929f0e1a7584f
tree: 53a7b7eca23b92975f44f7ccca81c5b3cf66ad04
  1. PermissionController/