Merge "service_manager: reorder permission checks for find"