[automerger skipped] Merge "Migrate apex/permission to...

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

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

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

Change-Id: Ibf9f78fec9e1dba484b7d70268ea94bf304e0ea9