Merge "Use APk-in-APEX for PermissionController."