[automerger skipped] Merge "Add new permission KEEP_UNINSTALLED_PACKAGES" am:...

[automerger skipped] Merge "Add new permission KEEP_UNINSTALLED_PACKAGES" am: 141033c6 am: b185d3d0 am: 3b96b5cb -s ours am: 9a473648 -s ours

am skip reason: Change-Id I2b262f3694478631d657cdbf088b6511072d4ff3 with SHA-1 5d1a7b14 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb8ae1cca470c45ca47c25fda945222aad3f73c8