[automerger skipped] Update Permission module to be compatible with latest...

[automerger skipped] Update Permission module to be compatible with latest Jetpack libraries am: c5b1b945 am: 51ff7e49 -s ours am: b9b301a4 -s ours

am skip reason: Merged-In I361292eb1a795eb6d6cae8253fd1dac5c198ecc1 with SHA-1 2d866e46 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2720274



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