Actually merge the upstream updates from 2.13.2-10

Probably due to the broken import on apertis/2.13.2-3co6 the most recent merge from upstream failed to actually apply the upstream changes.

Test build on OBS: https://build.collabora.co.uk/package/show/home:em:branches:apertis:v2020pre:target/apparmor

Installing the binaries on the v2020pre SDK didn't lead to major breakages, so I assume they are decent. 🗡

Here are the actual changes compared to the upstream Debian packaging: https://gitlab.apertis.org/pkg/target/apparmor/compare/debian%2Fbuster...wip%2Fem%2Factually-merge-upstream-updates