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 am: 0fdf4498

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



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