Merge "Mark ab/6881855 as merged" into stage-aosp-master am: 8407444715

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

Change-Id: I61e856cc82e0c0963f2ef13b1d1852124f611446