Merge "Rename two "service" fields in AbstractA11yServiceConnection" into main