[automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" am: d985fe7b0e am: e515ed6824 am: 8f89673bd7 -s ours am: 60183be45a -s ours am: 43ebfe6434 -s ours
am skip reason: Change-Id I1a6aac95deabeee6d301ad83a2ad31ed2663c02e with SHA-1 dbcf3a1e56 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562175
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I056c9d4241f6ccddf696b24fc99a3117c7ed3d2c
This commit is contained in: