Merge 84196390 ("Merge tag 'selinux-pr-20210322' of...

Merge 84196390 ("Merge tag 'selinux-pr-20210322' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux"

) into android-mainline

Steps on the way to 5.12-rc5

Resolves merge conflicts in:
	security/selinux/include/security.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic6a0922be222c6bdb829a43c00c7bff3d96a9009