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

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

Change-Id: If6ea0a68f3f2278d2d53bd248a52b905a1cbb545