[automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" into rvc-dev am: c560d404a0 -s ours am: 5a5cba8407 -s ours am: c8bc3d8f74 -s ours am: 4b7df1881b -s ours
am skip reason: Merged-In I38139a95761f70ad6a523888cdda2076ce65aa30 with SHA-1 f08bd224bb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14406612
Change-Id: I2e381f549fbc6513a838d6afaec9f6317a6d1e31
This commit is contained in: