Snap for 8326006 from 4fd9f2d0084dcfc532b9e5aa1ff6c78eb643b4f6 to mainline-media-release

Change-Id: I4a06daae66886cb243214610cb45a56f81e338e3
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d65e697..745ac0b 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -156,7 +156,8 @@
 .KATI_READONLY := PLATFORM_SDK_VERSION
 
 # This is the sdk extension version of this tree.
-PLATFORM_SDK_EXTENSION_VERSION :=$= 1
+PLATFORM_SDK_EXTENSION_VERSION := 2
+.KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION
 
 # This is the sdk extension version that PLATFORM_SDK_VERSION ships with.
 PLATFORM_BASE_SDK_EXTENSION_VERSION :=$= 0
@@ -246,7 +247,7 @@
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-      PLATFORM_SECURITY_PATCH := 2022-04-01
+      PLATFORM_SECURITY_PATCH := 2022-05-01
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH