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 am: f6e16606 am: c73c9ea6

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

Change-Id: I4a0d621c4cce315c14f0840ec9720af1a52c6e38