Merge "Reformat client info in dumpsys" into main