Merge "Baseline global lint errors in telephony" into main