[automerger skipped] Merge "permission(core): Modify protection level for...

[automerger skipped] Merge "permission(core): Modify protection level for SUBSCRIBE_TO_KEYGUARD" am: ee36a153 am: de3f5fcc am: 1e1f1b54 -s ours am: b3e74831 -s ours

am skip reason: Merged-In Iaa22957057dad13df84cbbe7c7e92c47d4e79fa2 with SHA-1 36a04ad2 is already in history

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



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