Merge "Fix a log format in DisplayManagerService" into main