Merge "Remove permission correcting code" into sc-dev am: 0088eefaac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I228f17e265fa6b87cfe21808fa7c218713e881ea