[automerger skipped] Merge "Fix security vulnerability of non-dynamic...

[automerger skipped] Merge "Fix security vulnerability of non-dynamic permission removal" into sc-dev am: 9ebd148a am: f5b1c57b am: 90d37aae -s ours am: 33defda5 -s ours am: 2a24e995 -s ours

am skip reason: Merged-In Ia146d4098643d9c473f8c83d33a8a125a53101fc with SHA-1 0ead58f6 is already in history

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



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