Merge cherrypicks of ['googleplex-android-review.googlesource.com/26048910', 'googleplex-android-review.googlesource.com/26052935'] into 24Q1-release.android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I6c85b5af3d95cb52f30ff6091eb59352b1952186

12 files changed, 18 insertions, 22 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 4fbab14..3b72b7e 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    build_id: "10917791"
-    target: "mainline_modules_sdks-trunk-userdebug"
-    source_file: "mainline-sdks/for-latest-build/current/com.google.android.mediaprovider/sdk/mediaprovider-module-sdk-current.zip"
+    build_id: "T1009193"
+    target: "train_build"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.mediaprovider/sdk/mediaprovider-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index d8dd098..9ec860f 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    build_id: "10917791"
-    target: "mainline_go_modules_sdks-trunk-userdebug"
-    source_file: "mainline-sdks/for-latest-build/current/com.google.android.go.mediaprovider/sdk/mediaprovider-module-sdk-current.zip"
+    build_id: "T1009193"
+    target: "train_build"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.mediaprovider/sdk/mediaprovider-module-sdk-current.zip"
   }
   dest_file: "go/current/current.zip"
   version: ""
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index eb34cf1..f59c164 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -88,7 +88,6 @@ Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Default;->asBinder()Lan
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/provider/MediaStore$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ART:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 1fda927..7355693 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -88,7 +88,6 @@ Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Default;->asBinder()Lan
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/provider/MediaStore$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ART:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ID:Ljava/lang/String;,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 57f76c3..f1475e5 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,6 +1,6 @@
 signature,file,startline,startcol,endline,endcol,properties
-Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2089,13,2089,96,maxTargetSdk=30&trackingBug=170729553L
-Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2098,13,2098,33,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2051,9,2051,29,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2057,9,2057,29,
-Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2063,9,2063,29,
+Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2094,13,2094,96,maxTargetSdk=30&trackingBug=170729553L
+Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2103,13,2103,33,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2056,9,2056,29,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2062,9,2062,29,
+Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2068,9,2068,29,
diff --git a/current/sdk_library/public/framework-mediaprovider.srcjar b/current/sdk_library/public/framework-mediaprovider.srcjar
index 3d0c033..008323a 100644
--- a/current/sdk_library/public/framework-mediaprovider.srcjar
+++ b/current/sdk_library/public/framework-mediaprovider.srcjar
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index fffc196..dfebdcf 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10917791
\ No newline at end of file
+11177391
\ No newline at end of file
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index eb34cf1..f59c164 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -88,7 +88,6 @@ Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Default;->asBinder()Lan
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/provider/MediaStore$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ART:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
diff --git a/go/current/hiddenapi/filtered-stub-flags.csv b/go/current/hiddenapi/filtered-stub-flags.csv
index 1fda927..7355693 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -88,7 +88,6 @@ Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Default;->asBinder()Lan
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/provider/MediaStore$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ART:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ID:Ljava/lang/String;,public-api,system-api,test-api
diff --git a/go/current/hiddenapi/index.csv b/go/current/hiddenapi/index.csv
index 57f76c3..f1475e5 100644
--- a/go/current/hiddenapi/index.csv
+++ b/go/current/hiddenapi/index.csv
@@ -1,6 +1,6 @@
 signature,file,startline,startcol,endline,endcol,properties
-Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2089,13,2089,96,maxTargetSdk=30&trackingBug=170729553L
-Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2098,13,2098,33,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2051,9,2051,29,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2057,9,2057,29,
-Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2063,9,2063,29,
+Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2094,13,2094,96,maxTargetSdk=30&trackingBug=170729553L
+Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2103,13,2103,33,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2056,9,2056,29,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2062,9,2062,29,
+Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2068,9,2068,29,
diff --git a/go/current/sdk_library/public/framework-mediaprovider.srcjar b/go/current/sdk_library/public/framework-mediaprovider.srcjar
index 3d0c033..008323a 100644
--- a/go/current/sdk_library/public/framework-mediaprovider.srcjar
+++ b/go/current/sdk_library/public/framework-mediaprovider.srcjar
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index fffc196..dfebdcf 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10917791
\ No newline at end of file
+11177391
\ No newline at end of file