Merge changes from topic "cherrypicker-L60200000961213913:N41200001377797274" into udc-dev

* changes:
  Avoid using soong_zip's "-e" flag for boot.zip.
  Add mainline extension and METADATA.txt to boot.zip.
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 09a0598..8dc4257 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -104,7 +104,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 := 2023-07-05
+    PLATFORM_SECURITY_PATCH := 2023-08-05
 endif
 
 include $(BUILD_SYSTEM)/version_util.mk