Merge "Fix security vulnerability of non-dynamic permission removal" into sc-dev am: 9ebd148a

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



Change-Id: I79e808c4c3c7ff33913823a9a32e8b47c8b6f3df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>