[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: c560920d96 -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: Idcd498df15506aef30fc5468e771210ef2fc0d38
tree: e8f8c136e31074cdb16a1f4b83950a69f10f3d36
  1. PermissionController/