Merge d1fec221 ("Merge tag 'selinux-pr-20210215' of...

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

) into android-mainline

Steps on the way to 5.12-rc1

Resolves conflicts in:
        security/selinux/hooks.c
        security/selinux/include/classmap.h

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