Merge android13-5.10 into android13-5.10-lts

This merges the android13-5.10 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* f951a14302d1 Merge tag 'android13-5.10.252_r00' into android13-5.10
* 49fc11143fbf Revert "ANDROID: mm/memfd-ashmem-shim: Introduce shim layer"
* 95ab689f43f4 Revert "ANDROID: mm: shmem: Use memfd-ashmem-shim ioctl handler"
* 7bdfa5487a3e Revert "ANDROID: GKI: Enable CONFIG_MEMFD_ASHMEM_SHIM"

Change-Id: Ib05537d650cf3c8813850eb670f496c5ed981c51
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>