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

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



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