Merge "Revert "remove emulator_vendor.mk from aosp_arm64.mk"" am: d4e85a97e7

Change-Id: I1576436f768348dffe64b4864fea69e590aa8ac7
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index fe71d7b..d6ef456 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -235,7 +235,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 := 2020-04-05
+      PLATFORM_SECURITY_PATCH := 2020-05-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH