[automerger skipped] Merge "Migrate apex/permission to packages/modules/Permission" am: d985fe7b am: e515ed68 am: 8f89673b -s ours am: 60183be4 -s ours am: 43ebfe64 -s ours

am skip reason: Change-Id I1a6aac95deabeee6d301ad83a2ad31ed2663c02e with SHA-1 dbcf3a1e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I056c9d4241f6ccddf696b24fc99a3117c7ed3d2c