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

Merge "Fix security vulnerability of non-dynamic permission removal" into tm-dev am: f24568f0 am: 70e95d1f am: 9e5143e1 am: 4fbc8a29 am: 1068716b

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



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