Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/platform//build into r

Android 11.0.0 Release 48 (RD2A.211001.002)

Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Change-Id: I373c3ee191ca9add8747f67b859c7d64baa21eea
diff --git a/core/build_id.mk b/core/build_id.mk
index 513c6ec..802b6cf 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=RQ3A.210905.001
+BUILD_ID=RD2A.211001.002
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index bdf0cbe..9b0b781 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-09-05
+      PLATFORM_SECURITY_PATCH := 2021-10-01
 endif
 PLATFORM_REAL_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)