diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 540961e..4cb77d0 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1005166"
+    build_id: "T1005628"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.mediaprovider/sdk/mediaprovider-module-sdk-current.zip"
   }
diff --git a/current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml b/current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml
index fac2f6d..3b73395 100644
--- a/current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml
+++ b/current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <config>
   <compat-change description="Allow apps holding {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE} permission to request raw external storage access." enableAfterTargetSdk="30" id="178209446" name="ENABLE_RAW_MANAGE_EXTERNAL_STORAGE_ACCESS">
-    <meta-data definedIn="com.android.providers.media.LocalCallingIdentity" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/LocalCallingIdentity.java:399" />
+    <meta-data definedIn="com.android.providers.media.LocalCallingIdentity" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/LocalCallingIdentity.java:415" />
   </compat-change>
   <compat-change description="Allow apps holding {@link android.app.role}#SYSTEM_GALLERY role to request raw external storage access." enableSinceTargetSdk="30" id="183372781" name="ENABLE_RAW_SYSTEM_GALLERY_ACCESS">
-    <meta-data definedIn="com.android.providers.media.LocalCallingIdentity" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/LocalCallingIdentity.java:407" />
+    <meta-data definedIn="com.android.providers.media.LocalCallingIdentity" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/LocalCallingIdentity.java:423" />
   </compat-change>
   <compat-change description="Enables checks to stop apps from inserting and updating to private files via media provider." enableAfterTargetSdk="30" id="172100307" name="ENABLE_CHECKS_FOR_PRIVATE_FILES">
-    <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:304" />
+    <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:306" />
   </compat-change>
   <compat-change description="Enable option to defer the scan triggered as part of MediaProvider#update()" enableAfterTargetSdk="30" id="180326732" name="ENABLE_DEFERRED_SCAN">
     <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:399" />
@@ -16,9 +16,9 @@
     <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:407" />
   </compat-change>
   <compat-change description="Force enable an app to support the HEVC media capability Apps should declare their supported media capabilities in their manifest but this flag can be used to force an app into supporting HEVC, hence avoiding transcoding while accessing media encoded in HEVC. Setting this flag will override any OS level defaults for apps. It is disabled by default, meaning that the OS defaults would take precedence. Setting this flag and {@code FORCE_DISABLE_HEVC_SUPPORT} is an undefined state and will result in the OS ignoring both flags." disabled="true" id="174228127" name="FORCE_ENABLE_HEVC_SUPPORT">
-    <meta-data definedIn="com.android.providers.media.TranscodeHelperImpl" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/TranscodeHelperImpl.java:166" />
+    <meta-data definedIn="com.android.providers.media.TranscodeHelperImpl" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/TranscodeHelperImpl.java:160" />
   </compat-change>
   <compat-change description="Force disable an app from supporting the HEVC media capability Apps should declare their supported media capabilities in their manifest but this flag can be used to force an app into not supporting HEVC, hence forcing transcoding while accessing media encoded in HEVC. Setting this flag will override any OS level defaults for apps. It is disabled by default, meaning that the OS defaults would take precedence. Setting this flag and {@code FORCE_ENABLE_HEVC_SUPPORT} is an undefined state and will result in the OS ignoring both flags." disabled="true" id="174227820" name="FORCE_DISABLE_HEVC_SUPPORT">
-    <meta-data definedIn="com.android.providers.media.TranscodeHelperImpl" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/TranscodeHelperImpl.java:183" />
+    <meta-data definedIn="com.android.providers.media.TranscodeHelperImpl" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/TranscodeHelperImpl.java:177" />
   </compat-change>
 </config>
\ No newline at end of file
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 1f31b28..caa74a6 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -52,10 +52,12 @@
 Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->DATE_TAKEN_MILLIS:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->DURATION_MILLIS:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->HEIGHT:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->IS_FAVORITE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->MEDIA_STORE_URI:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->MIME_TYPE:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->ORIENTATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->SIZE_BYTES:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_ANIMATED_WEBP:I,public-api,sdk,system-api,test-api
@@ -63,6 +65,7 @@
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_MOTION_PHOTO:I,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_NONE:I,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->SYNC_GENERATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->WIDTH:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_ALBUM_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_LOOPING_PLAYBACK_ENABLED:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -318,8 +321,11 @@
 Landroid/provider/MediaStore$PickerMediaColumns;->DATE_TAKEN:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$PickerMediaColumns;->DISPLAY_NAME:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$PickerMediaColumns;->DURATION_MILLIS:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->HEIGHT:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$PickerMediaColumns;->MIME_TYPE:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->ORIENTATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$PickerMediaColumns;->SIZE:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->WIDTH:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;->CONTENT_TYPE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;->DEFAULT_SORT_ORDER: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 296e733..b80d776 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -52,10 +52,12 @@
 Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->DATE_TAKEN_MILLIS:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->DURATION_MILLIS:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->HEIGHT:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->ID:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->IS_FAVORITE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->MEDIA_STORE_URI:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->MIME_TYPE:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->ORIENTATION:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->SIZE_BYTES:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_ANIMATED_WEBP:I,public-api,system-api,test-api
@@ -63,6 +65,7 @@
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_MOTION_PHOTO:I,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_NONE:I,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract$MediaColumns;->SYNC_GENERATION:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->WIDTH:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_ALBUM_ID:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_LOOPING_PLAYBACK_ENABLED:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,system-api,test-api
@@ -297,8 +300,11 @@
 Landroid/provider/MediaStore$PickerMediaColumns;->DATE_TAKEN:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$PickerMediaColumns;->DISPLAY_NAME:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$PickerMediaColumns;->DURATION_MILLIS:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->HEIGHT:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$PickerMediaColumns;->MIME_TYPE:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->ORIENTATION:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$PickerMediaColumns;->SIZE:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->WIDTH:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;-><init>()V,public-api,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;->CONTENT_TYPE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;->DEFAULT_SORT_ORDER:Ljava/lang/String;,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 233e7e0..a837ef8 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,1959,13,1959,96,maxTargetSdk=30&trackingBug=170729553L
-Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1968,13,1968,33,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1921,9,1921,29,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1927,9,1927,29,
-Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1933,9,1933,29,
+Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2039,13,2039,96,maxTargetSdk=30&trackingBug=170729553L
+Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2048,13,2048,33,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2001,9,2001,29,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2007,9,2007,29,
+Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2013,9,2013,29,
diff --git a/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar b/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
index b1c39c3..47499e6 100644
--- a/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
+++ b/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-mediaprovider.srcjar b/current/sdk_library/module-lib/framework-mediaprovider.srcjar
index 54f913e..040cf36 100644
--- a/current/sdk_library/module-lib/framework-mediaprovider.srcjar
+++ b/current/sdk_library/module-lib/framework-mediaprovider.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-mediaprovider-stubs.jar b/current/sdk_library/public/framework-mediaprovider-stubs.jar
index 35a1359..2821333 100644
--- a/current/sdk_library/public/framework-mediaprovider-stubs.jar
+++ b/current/sdk_library/public/framework-mediaprovider-stubs.jar
Binary files differ
diff --git a/current/sdk_library/public/framework-mediaprovider.srcjar b/current/sdk_library/public/framework-mediaprovider.srcjar
index 9c9068e..b5be076 100644
--- a/current/sdk_library/public/framework-mediaprovider.srcjar
+++ b/current/sdk_library/public/framework-mediaprovider.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-mediaprovider.txt b/current/sdk_library/public/framework-mediaprovider.txt
index 8e1691a..b0d655d 100644
--- a/current/sdk_library/public/framework-mediaprovider.txt
+++ b/current/sdk_library/public/framework-mediaprovider.txt
@@ -82,10 +82,12 @@
   public static final class CloudMediaProviderContract.MediaColumns {
     field public static final String DATE_TAKEN_MILLIS = "date_taken_millis";
     field public static final String DURATION_MILLIS = "duration_millis";
+    field public static final String HEIGHT = "height";
     field public static final String ID = "id";
     field public static final String IS_FAVORITE = "is_favorite";
     field public static final String MEDIA_STORE_URI = "media_store_uri";
     field public static final String MIME_TYPE = "mime_type";
+    field public static final String ORIENTATION = "orientation";
     field public static final String SIZE_BYTES = "size_bytes";
     field public static final String STANDARD_MIME_TYPE_EXTENSION = "standard_mime_type_extension";
     field public static final int STANDARD_MIME_TYPE_EXTENSION_ANIMATED_WEBP = 3; // 0x3
@@ -93,6 +95,7 @@
     field public static final int STANDARD_MIME_TYPE_EXTENSION_MOTION_PHOTO = 2; // 0x2
     field public static final int STANDARD_MIME_TYPE_EXTENSION_NONE = 0; // 0x0
     field public static final String SYNC_GENERATION = "sync_generation";
+    field public static final String WIDTH = "width";
   }
 
   public final class MediaStore {
@@ -464,8 +467,11 @@
     field public static final String DATE_TAKEN = "datetaken";
     field public static final String DISPLAY_NAME = "_display_name";
     field public static final String DURATION_MILLIS = "duration";
+    field public static final String HEIGHT = "height";
     field public static final String MIME_TYPE = "mime_type";
+    field public static final String ORIENTATION = "orientation";
     field public static final String SIZE = "_size";
+    field public static final String WIDTH = "width";
   }
 
   public static final class MediaStore.Video {
diff --git a/current/sdk_library/system/framework-mediaprovider-stubs.jar b/current/sdk_library/system/framework-mediaprovider-stubs.jar
index b1c39c3..47499e6 100644
--- a/current/sdk_library/system/framework-mediaprovider-stubs.jar
+++ b/current/sdk_library/system/framework-mediaprovider-stubs.jar
Binary files differ
diff --git a/current/sdk_library/system/framework-mediaprovider.srcjar b/current/sdk_library/system/framework-mediaprovider.srcjar
index 54f913e..040cf36 100644
--- a/current/sdk_library/system/framework-mediaprovider.srcjar
+++ b/current/sdk_library/system/framework-mediaprovider.srcjar
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index df75c7e..444d619 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9279842
\ No newline at end of file
+9427200
\ No newline at end of file