Snap for 7641964 from 548474ce340ac836b13ae6bdcb366bd1088b6124 to sc-d1-release

Change-Id: Iaea9b1031362422aa91d3e38cd7468c45ed0c6fb
diff --git a/shared/device.mk b/shared/device.mk
index 9e90e8e..8647d01 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -142,6 +142,9 @@
 # DRM service opt-in
 PRODUCT_VENDOR_PROPERTIES += drm.service.enabled=true
 
+# Call deleteAllKeys if vold detects a factory reset
+PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled=true
+
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera/devices/EmulatedCamera