Make change and version bump to TQ2A.230505.001
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21959028'] into tm-qpr2-release.

Change-Id: I98599069e3b5c4c52aa84c58b65fc444a00181be
diff --git a/core/build_id.mk b/core/build_id.mk
index 4adc373..9c8a002 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=TQ2A.230405.003
+BUILD_ID=TQ2A.230505.001
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 38d0510..419ff1a 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -103,7 +103,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 := 2023-04-05
+    PLATFORM_SECURITY_PATCH := 2023-05-05
 endif
 
 include $(BUILD_SYSTEM)/version_util.mk