Merge "Refactor: Use SdkUtil.isAtLeast25Q4 in ConnectivityService" into main