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