Merge "Enable NewApi lint checks on service-connectivity" into main