DO NOT MERGE - Merge QQ2A.200405.005 into master

Bug: 150877681
Change-Id: I5e36c453de41b16cf722454edb21428cfd3b759c
Merged-In: Ic383f938d12f9fac0d93364ba737f0c401fb0a01
Merged-In: I4e5b07e96a1ddc23057b373a1ff7d9f54ae361bb
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index ab7783f..811bcd8 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -250,7 +250,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-03-05
+      PLATFORM_SECURITY_PATCH := 2020-04-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH