Now that the modem firmware is installed in the referenced location, the firmware patch is not needed, so remove that as well. Also backport a fix for the Pixel 3a XL so a kernel upgrade isn't needed for that.