Merge "Fix security vulnerability of non-dynamic permission removal" into...

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

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



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