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: I794b41aab02885217c78c4f89b63f9489f70209e