[automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-qpr-dev am: fd2df8ef61 -s ours am: 1d2d9b118e -s ours am: 73b9e9710c -s ours am: cc4fc2187a -s ours am: 21a1a710d9 -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: Ifbfea985b343889578d5865ff4a627591ec531d1
This commit is contained in: