[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 skip reason: subject contains skip directive

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

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