Make change and version bump to RQ2A.210505.001

Change-Id: Id84cd8b91fedbfc816a41ce0f670fc26147ff44d
diff --git a/core/build_id.mk b/core/build_id.mk
index 5ea3b97..a50318d 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RQ2A.210405.006
+BUILD_ID=RQ2A.210505.001
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e83b8b0..b32474d 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,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 := 2021-04-05
+      PLATFORM_SECURITY_PATCH := 2021-05-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH