diff -Nru apparmor-2.12/debian/changelog apparmor-2.12/debian/changelog
--- apparmor-2.12/debian/changelog	2018-09-28 03:50:54.000000000 +0930
+++ apparmor-2.12/debian/changelog	2023-06-21 09:21:13.000000000 +0930
@@ -1,3 +1,11 @@
+apparmor (2.12-4ubuntu5.3) bionic-security; urgency=medium
+
+  * debian/lib/apparmor/functions: remove support for loading snapd
+    generated profiles in /var/lib/snapd/apparmor/profiles as these are
+    handled by snapd.apparmor.service (LP: #2024637)
+
+ -- Alex Murray <alex.murray@canonical.com>  Wed, 21 Jun 2023 09:21:13 +0930
+
 apparmor (2.12-4ubuntu5.1) bionic-security; urgency=medium
 
   * lp1788929+1794848.patch:
diff -Nru apparmor-2.12/debian/lib/apparmor/functions apparmor-2.12/debian/lib/apparmor/functions
--- apparmor-2.12/debian/lib/apparmor/functions	2018-03-23 06:50:28.000000000 +1030
+++ apparmor-2.12/debian/lib/apparmor/functions	2023-06-21 09:20:03.000000000 +0930
@@ -21,8 +21,6 @@
 
 PROFILES="/etc/apparmor.d"
 PROFILES_CACHE="$PROFILES/cache"
-PROFILES_VAR="/var/lib/snapd/apparmor/profiles"
-PROFILES_CACHE_VAR="/var/cache/apparmor"
 PARSER="/sbin/apparmor_parser"
 SECURITYFS="/sys/kernel/security"
 export AA_SFS="$SECURITYFS/apparmor"
@@ -34,7 +32,7 @@
 
 foreach_configured_profile() {
 	rc_all="0"
-	for pdir in "$PROFILES" "$PROFILES_VAR" ; do
+	for pdir in "$PROFILES" ; do
 		if [ ! -d "$pdir" ]; then
 			continue
 		fi
@@ -44,21 +42,11 @@
 		fi
 
 		cache_dir="$PROFILES_CACHE"
-		if [ -d "$PROFILES_CACHE_VAR" ] && [ "$pdir" = "$PROFILES_VAR" ]; then
-			cache_dir="$PROFILES_CACHE_VAR"
-		fi
 		cache_args="--cache-loc=$cache_dir"
 		if [ ! -d "$cache_dir" ]; then
 			cache_args=
 		fi
 
-		# LP: #1383858 - expr tree simplification is too slow for some
-		# policy on 32bit ARM, so disable it for now
-		cache_extra_args=
-		if [ -d "$PROFILES_CACHE_VAR" ] && [ "$pdir" = "$PROFILES_VAR" ]; then
-			cache_extra_args="-O no-expr-simplify"
-		fi
-
 		# If need to compile everything, then use -n1 with xargs to
 		# take advantage of -P. When cache files are in use, omit -n1
 		# since it is considerably faster on moderately sized profile