Please see #40901 (closed) for the details of the conflicts.
Our patch were modified only by Mozilla removing
brand.properties (they just removed it, without moving elsewhere, see 1d40396f), and the patch to remove LockWise branding (a piece should have already been removed in v99 but remained, and now I removed it entirely; anyway, that patch affects only desktop, if I understood correctly).
The rest of conflicts are easily manageable and do not change our patches.
I have kept my quick&dirty patch to fix the .aar creation, but I have created #40904 to fix it. In the meantime, we'll need it to create nightly builds.