Merge "Fixed the incorrect carrier config for 5G icon timer" into main