diff --git a/Android.bp b/Android.bp
index 4973c13..a2f202f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -375,3 +375,12 @@
     reqd_mask: true,
     soc_specific: true,
 }
+
+// For vts_treble_sys_prop_test
+filegroup {
+    name: "private_property_contexts",
+    srcs: ["private/property_contexts"],
+    visibility: [
+        "//test/vts-testcase/security/system_property",
+    ],
+}
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index d726fcd..8557aea 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -39,6 +39,7 @@
     ctl_interface_start_prop
     ctl_interface_stop_prop
     ctl_sigstop_prop
+    dalvik_config_prop
     device_config_boot_count_prop
     device_config_reset_performed_prop
     device_config_netd_native_prop
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index 27faba7..e41ee74 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -37,6 +37,7 @@
     ctl_interface_start_prop
     ctl_interface_stop_prop
     ctl_sigstop_prop
+    dalvik_config_prop
     device_config_boot_count_prop
     device_config_reset_performed_prop
     device_config_netd_native_prop
diff --git a/private/compat/29.0/29.0.cil b/private/compat/29.0/29.0.cil
index d81263c..410d8e4 100644
--- a/private/compat/29.0/29.0.cil
+++ b/private/compat/29.0/29.0.cil
@@ -1,5 +1,6 @@
 ;; types removed from current policy
 (type ashmemd)
+(type exported_dalvik_prop)
 (type exported_vold_prop)
 (type exported2_config_prop)
 (type exported2_vold_prop)
@@ -1208,7 +1209,7 @@
 (typeattributeset exported_audio_prop_29_0 (exported_audio_prop))
 (typeattributeset exported_bluetooth_prop_29_0 (exported_bluetooth_prop))
 (typeattributeset exported_config_prop_29_0 (exported_config_prop))
-(typeattributeset exported_dalvik_prop_29_0 (exported_dalvik_prop))
+(typeattributeset exported_dalvik_prop_29_0 (exported_dalvik_prop dalvik_config_prop))
 (typeattributeset exported_default_prop_29_0
   ( exported_default_prop
     surfaceflinger_prop
diff --git a/private/domain.te b/private/domain.te
index 8163aea..2369e55 100644
--- a/private/domain.te
+++ b/private/domain.te
@@ -73,7 +73,7 @@
 # Device specific properties are not granted by default
 not_compatible_property(`
     get_prop(domain, core_property_type)
-    get_prop(domain, exported_dalvik_prop)
+    get_prop(domain, dalvik_config_prop)
     get_prop(domain, exported_ffs_prop)
     get_prop(domain, exported_system_radio_prop)
     get_prop(domain, exported2_radio_prop)
@@ -87,7 +87,7 @@
 ')
 compatible_property_only(`
     get_prop({coredomain appdomain shell}, core_property_type)
-    get_prop({coredomain appdomain shell}, exported_dalvik_prop)
+    get_prop({coredomain appdomain shell}, dalvik_config_prop)
     get_prop({coredomain appdomain shell}, exported_ffs_prop)
     get_prop({coredomain appdomain shell}, exported_system_radio_prop)
     get_prop({coredomain appdomain shell}, exported2_radio_prop)
diff --git a/private/property.te b/private/property.te
index 0cdadbf..84651ef 100644
--- a/private/property.te
+++ b/private/property.te
@@ -135,7 +135,6 @@
     core_property_type
     extended_core_property_type
     exported_config_prop
-    exported_dalvik_prop
     exported_default_prop
     exported_dumpstate_prop
     exported_ffs_prop
@@ -237,8 +236,8 @@
     -vendor_init
   } {
     core_property_type
+    dalvik_config_prop
     extended_core_property_type
-    exported_dalvik_prop
     exported_ffs_prop
     exported_system_radio_prop
     exported2_system_prop
diff --git a/private/property_contexts b/private/property_contexts
index 6f85e15..93aebe1 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -263,67 +263,67 @@
 camera.disable_zsl_mode u:object_r:exported3_default_prop:s0 exact bool
 camera.fifo.disable     u:object_r:exported3_default_prop:s0 exact int
 
-dalvik.vm.appimageformat                    u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.backgroundgctype                  u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.boot-dex2oat-cpu-set              u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.boot-dex2oat-threads              u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.boot-image                        u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.checkjni                          u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.dex2oat-Xms                       u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.dex2oat-Xmx                       u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.dex2oat-cpu-set                   u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.dex2oat-filter                    u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.dex2oat-flags                     u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.dex2oat-threads                   u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.dex2oat64.enabled                 u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.dexopt.secondary                  u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.execution-mode                    u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.extra-opts                        u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.foreground-heap-growth-multiplier u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.gctype                            u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heapgrowthlimit                   u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heapmaxfree                       u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heapminfree                       u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heapsize                          u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heapstartsize                     u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.heaptargetutilization             u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.hot-startup-method-samples        u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.image-dex2oat-Xms                 u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.image-dex2oat-Xmx                 u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.image-dex2oat-cpu-set             u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.image-dex2oat-filter              u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.image-dex2oat-flags               u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.image-dex2oat-threads             u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.isa.arm.features                  u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.arm.variant                   u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.arm64.features                u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.arm64.variant                 u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.mips.features                 u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.mips.variant                  u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.mips64.features               u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.mips64.variant                u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.unknown.features              u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.unknown.variant               u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.x86.features                  u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.x86.variant                   u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.x86_64.features               u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.isa.x86_64.variant                u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.jitinitialsize                    u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.jitmaxsize                        u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.jitprithreadweight                u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.jitthreshold                      u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.jittransitionweight               u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.jniopts                           u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.lockprof.threshold                u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.method-trace                      u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.method-trace-file                 u:object_r:exported_dalvik_prop:s0 exact string
-dalvik.vm.method-trace-file-siz             u:object_r:exported_dalvik_prop:s0 exact int
-dalvik.vm.method-trace-stream               u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.profilesystemserver               u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.profilebootclasspath              u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.usejit                            u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.usejitprofiles                    u:object_r:exported_dalvik_prop:s0 exact bool
-dalvik.vm.zygote.max-boot-retry             u:object_r:exported_dalvik_prop:s0 exact int
+dalvik.vm.appimageformat                    u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.backgroundgctype                  u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.boot-dex2oat-cpu-set              u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.boot-dex2oat-threads              u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.boot-image                        u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.checkjni                          u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.dex2oat-Xms                       u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-Xmx                       u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-cpu-set                   u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-filter                    u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-flags                     u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.dex2oat-threads                   u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.dex2oat64.enabled                 u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.dexopt.secondary                  u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.execution-mode                    u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.extra-opts                        u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.foreground-heap-growth-multiplier u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.gctype                            u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heapgrowthlimit                   u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heapmaxfree                       u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heapminfree                       u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heapsize                          u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heapstartsize                     u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.heaptargetutilization             u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.hot-startup-method-samples        u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.image-dex2oat-Xms                 u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.image-dex2oat-Xmx                 u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.image-dex2oat-cpu-set             u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.image-dex2oat-filter              u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.image-dex2oat-flags               u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.image-dex2oat-threads             u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.isa.arm.features                  u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.arm.variant                   u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.arm64.features                u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.arm64.variant                 u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.mips.features                 u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.mips.variant                  u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.mips64.features               u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.mips64.variant                u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.unknown.features              u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.unknown.variant               u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.x86.features                  u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.x86.variant                   u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.x86_64.features               u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.isa.x86_64.variant                u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.jitinitialsize                    u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.jitmaxsize                        u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.jitprithreadweight                u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.jitthreshold                      u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.jittransitionweight               u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.jniopts                           u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.lockprof.threshold                u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.method-trace                      u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.method-trace-file                 u:object_r:dalvik_config_prop:s0 exact string
+dalvik.vm.method-trace-file-siz             u:object_r:dalvik_config_prop:s0 exact int
+dalvik.vm.method-trace-stream               u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.profilesystemserver               u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.profilebootclasspath              u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.usejit                            u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.usejitprofiles                    u:object_r:dalvik_config_prop:s0 exact bool
+dalvik.vm.zygote.max-boot-retry             u:object_r:dalvik_config_prop:s0 exact int
 
 drm.service.enabled u:object_r:exported3_default_prop:s0 exact bool
 
@@ -406,7 +406,7 @@
 ro.crypto.volume.metadata.method                u:object_r:vold_config_prop:s0 exact string
 ro.crypto.volume.options                        u:object_r:vold_config_prop:s0 exact string
 
-ro.dalvik.vm.native.bridge u:object_r:exported_dalvik_prop:s0 exact string
+ro.dalvik.vm.native.bridge u:object_r:dalvik_config_prop:s0 exact string
 
 external_storage.projid.enabled   u:object_r:storage_config_prop:s0 exact bool
 external_storage.casefold.enabled u:object_r:storage_config_prop:s0 exact bool
diff --git a/private/seapp_contexts b/private/seapp_contexts
index 6c3b607..99d1e6c 100644
--- a/private/seapp_contexts
+++ b/private/seapp_contexts
@@ -153,7 +153,7 @@
 user=webview_zygote seinfo=webview_zygote domain=webview_zygote
 user=_isolated domain=isolated_app levelFrom=all
 user=_app seinfo=app_zygote domain=app_zygote levelFrom=all
-user=_app seinfo=media domain=mediaprovider name=android.process.media type=app_data_file levelFrom=user
+user=_app seinfo=media domain=mediaprovider type=app_data_file levelFrom=user
 user=_app seinfo=platform domain=platform_app type=app_data_file levelFrom=user
 user=_app isEphemeralApp=true domain=ephemeral_app type=app_data_file levelFrom=all
 user=_app isPrivApp=true domain=priv_app type=privapp_data_file levelFrom=user
@@ -165,6 +165,7 @@
 user=_app isPrivApp=true name=com.google.android.gms domain=gmscore_app type=privapp_data_file levelFrom=user
 user=_app isPrivApp=true name=com.google.android.gms.* domain=gmscore_app type=privapp_data_file levelFrom=user
 user=_app isPrivApp=true name=com.google.android.gms:* domain=gmscore_app type=privapp_data_file levelFrom=user
+user=_app isPrivApp=true name=com.google.android.gsf domain=gmscore_app type=privapp_data_file levelFrom=user
 user=_app minTargetSdkVersion=30 domain=untrusted_app type=app_data_file levelFrom=all
 user=_app minTargetSdkVersion=29 domain=untrusted_app_29 type=app_data_file levelFrom=all
 user=_app minTargetSdkVersion=28 domain=untrusted_app_27 type=app_data_file levelFrom=all
diff --git a/public/property.te b/public/property.te
index 932dfab..9056c86 100644
--- a/public/property.te
+++ b/public/property.te
@@ -101,6 +101,7 @@
 # Properties which can be written only by vendor_init
 system_vendor_config_prop(apk_verity_prop)
 system_vendor_config_prop(cpu_variant_prop)
+system_vendor_config_prop(dalvik_config_prop)
 system_vendor_config_prop(exported_audio_prop)
 system_vendor_config_prop(exported_camera_prop)
 system_vendor_config_prop(exported_config_prop)
@@ -134,7 +135,6 @@
 system_public_prop(exported2_system_prop)
 system_public_prop(exported3_radio_prop)
 system_public_prop(exported_bluetooth_prop)
-system_public_prop(exported_dalvik_prop)
 system_public_prop(exported_ffs_prop)
 system_public_prop(exported_overlay_prop)
 system_public_prop(exported_pm_prop)
diff --git a/public/vendor_init.te b/public/vendor_init.te
index bd9ec16..dd74005 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -215,7 +215,6 @@
 set_prop(vendor_init, exported_bluetooth_prop)
 set_prop(vendor_init, exported_camera_prop)
 set_prop(vendor_init, exported_config_prop)
-set_prop(vendor_init, exported_dalvik_prop)
 set_prop(vendor_init, exported_default_prop)
 set_prop(vendor_init, exported_ffs_prop)
 set_prop(vendor_init, exported_overlay_prop)