Merge "Don't keep pregrants for non-system apps after partial uninstallation"...

Merge "Don't keep pregrants for non-system apps after partial uninstallation" into main am: 8540f01f

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



Change-Id: Ib3da4e03d353a73723231950ca6a23c1cb99ef7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>