[automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-qpr-dev am: fd2df8ef61 -s ours

am skip reason: Merged-In I31f2b4512164bb043d78d503f4f38accedc49f8d with SHA-1 7ec2a29f78 is already in history

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

Change-Id: I24eed3e77e1b6d59f43b6779588b0c397a3f42bc