Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Bug: 337098550
Merged-In: Ia0d57705ea79edf5232d2932b12d554fa4d13372
Change-Id: I2508c2e6a628154cfd06aa97fcc7a8eeb0a7a315
diff --git a/Android.bp b/Android.bp
index 06b597f..9323a57 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,7 @@
 // This file is generated by cargo_embargo.
-// Do not modify this file as changes will be overridden on upgrade.
+// Do not modify this file after the first "rust_*" or "genrule" module
+// because the changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
 
 package {
     default_team: "trendy_team_android_rust",