Merge changes from topic "memfd-ashmem-compat-platform-tests" into main am: aeb5aaed46 am: b9578b5ce7

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3521635

Change-Id: Ic2cdf58da0486c74edf7005b632104b01978c04f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>