Merge changes I17671ca2,I4e6d9d93,Ia43cbbd0 am: 8bd7c4f3cc

Change-Id: I9255204c82593f44ddfd0a37381ae856e86df40a
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