Merge changes I57e27303,I58ef0565 into android-mainline

* changes:
  Merge 20fdfd55 ("Merge tag 'mm-hotfixes-stable-2023-03-04-13-12' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline
  Revert "mm/mremap: fix dup_anon_vma() in vma_merge() case 4"