Merge "Clean up permissions when system app fails to scan" into rvc-dev am:...

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

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

Change-Id: I08d742076daa107d7a815b3bf4f9bf7694a4f421