Merge "Clean up permissions when system app fails to scan" into rvc-dev am: 410ddb91 am: 2e37a0cb am: efe004ec

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

Change-Id: Ia1eac99cea2ba4e04fff3e0c422285ccab6c7b9a