[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 3c41e9fae0 -s ours am: 1dcb0b6901 -s ours am: 2df4912b33 -s ours am: 7ea0a4df6c -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/2058909

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