Merge "Make starlark board configuration work with sdk_phone_x86_64" am: 2f1bd70c9c am: 8df9e5c1c2 am: 286c0c11b3

Original change: https://android-review.googlesource.com/c/platform/build/+/1849978

Change-Id: Ica9b63e2ecfa180d15882954bc47c0e6bc4a38d2
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 8432513..18d00ce 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -85,7 +85,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 := 2021-11-05
+    PLATFORM_SECURITY_PATCH := 2021-12-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH