Merge "Fix security vulnerability of non-dynamic permission removal" into tm-dev am: f24568f0

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



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