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: 6643ffef am: a8a14f4b am: 1aefe640 am: e8bb0b2d

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



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