Merge "Refactor ManualPermissionCheckDetector for @PermissionMethod"