Merge changes from topic "ashmem-ioctl-fixes" into main am: edbffe40d7

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/3451917

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