Merge "Add perfetto traces to ServiceManager" into main