But this doesn't change any of that. It only changes whether the scanning happens on your device as part of the upload process instead of on the server after the upload.
Ethics aside, on-device scanning has the benefit of Constitutional protection, at least in the USA. Any attempt by the Government to compel Apple to expand the on-device searching of privately owned devices to find other things would be a clear-cut 4th Amendment violation.