Merge cherrypicks of ['android-review.googlesource.com/3115566'] into 24Q3-release.

Change-Id: I8a92812418bcad2d35f09cde015220bedbe4bdb0

Android.bp

diff --git a/Android.bp b/Android.bp
index 2dcaa6b..3712ba6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,7 +78,7 @@
 java_defaults {
     name: "NetworkStackReleaseTargetSdk",
     min_sdk_version: "30",
-    target_sdk_version: "34",
+    target_sdk_version: "35",
 }
 
 java_defaults {