Merge android10-qpr3-release to aosp-master - DO NOT MERGE

Merged-In: I05e3e332007665f72a97b217a3e829441f87f811
Change-Id: I1119b2533299f722e1c8b7faa369925168024d25
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d375780..8ebfdd8 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -237,7 +237,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-06-05
+      PLATFORM_SECURITY_PATCH := 2020-07-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH