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: 2f6ff6d5

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

Change-Id: I541acc5f5618b42002def50b02f61530d6798796