Merge "Grant PermissionController SUBSTITUTE_NOTIFICATION_APP_NAME"